summaryrefslogtreecommitdiffstats
path: root/src/graphics/opengl/gldevice.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/graphics/opengl/gldevice.cpp')
-rw-r--r--src/graphics/opengl/gldevice.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp
index eb4eb31..e329ff4 100644
--- a/src/graphics/opengl/gldevice.cpp
+++ b/src/graphics/opengl/gldevice.cpp
@@ -393,10 +393,16 @@ Gfx::Texture* Gfx::CGLDevice::CreateTexture(CImage *image, const Gfx::TextureCre
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE);
GLenum sourceFormat = 0;
- if (params.alpha)
+ if (params.format == Gfx::TEX_IMG_RGB)
+ sourceFormat = GL_RGB;
+ else if (params.format == Gfx::TEX_IMG_BGR)
+ sourceFormat = GL_BGR;
+ else if (params.format == Gfx::TEX_IMG_RGBA)
sourceFormat = GL_RGBA;
+ else if (params.format == Gfx::TEX_IMG_BGRA)
+ sourceFormat = GL_BGRA;
else
- sourceFormat = GL_RGB;
+ assert(false);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, data->surface->w, data->surface->h,
0, sourceFormat, GL_UNSIGNED_BYTE, data->surface->pixels);