From 1b663ebc5f282dd20a2e3ce710670e673f45e55e Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 17 Sep 2013 09:08:36 +0000 Subject: [PATCH] GLDraw: Fixed for Win32 git-svn-id: svn://ultimatepp.org/upp/trunk@6363 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/GLDraw/GLDraw.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/uppsrc/GLDraw/GLDraw.cpp b/uppsrc/GLDraw/GLDraw.cpp index 45e5276b7..4473eae92 100644 --- a/uppsrc/GLDraw/GLDraw.cpp +++ b/uppsrc/GLDraw/GLDraw.cpp @@ -2,8 +2,12 @@ #define LLOG(x) LOG(x) +#ifndef GL_BGRA // Win32 missing these +#define GL_BGRA 0x80E1 +#endif + namespace Upp { - + struct ImageGLData { // Image img; GLuint texture_id; @@ -23,8 +27,8 @@ void ImageGLData::Init(const Image& img) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); +// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); +// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); LLOG("Texture id created: " << texture_id); // SysImageRealized(img); // ?