ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Standalone surfaces should never be sRGB.

Browse Source
This commit is contained in:
Henri Verbeet 2011-03-02 08:55:48 +01:00 committed by Alexandre Julliard
parent fe425a2f23
commit ddc7a803e9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/wined3d/surface.c
View File

@ -707,24 +707,25 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb)
} }
else else
{ {
GLuint *name = srgb ? &surface->texture_name_srgb : &surface->texture_name;
if (surface->texture_level) if (surface->texture_level)
{ {
ERR("Standalone surface %p is non-zero texture level %u.\n", ERR("Standalone surface %p is non-zero texture level %u.\n",
surface, surface->texture_level); surface, surface->texture_level);
} }
if (srgb)
ERR("Trying to bind standalone surface %p as sRGB.\n", surface);
ENTER_GL(); ENTER_GL();
if (!*name) if (!surface->texture_name)
{ {
glGenTextures(1, name); glGenTextures(1, &surface->texture_name);
checkGLcall("glGenTextures"); checkGLcall("glGenTextures");
TRACE("Surface %p given name %u.\n", surface, *name); TRACE("Surface %p given name %u.\n", surface, surface->texture_name);
glBindTexture(surface->texture_target, *name); glBindTexture(surface->texture_target, surface->texture_name);
checkGLcall("glBindTexture"); checkGLcall("glBindTexture");
glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
@ -735,7 +736,7 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb)
} }
else else
{ {
glBindTexture(surface->texture_target, *name); glBindTexture(surface->texture_target, surface->texture_name);
checkGLcall("glBindTexture"); checkGLcall("glBindTexture");
} }