Stefan Dösinger : wined3d: Do not enable GL_APPLE_client_storage for the dummy textures.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 4 08:14:27 CDT 2007
Module: wine
Branch: master
Commit: cd7ed61cfa62fb028e7a94f04cd05fb8fdcdb12a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7ed61cfa62fb028e7a94f04cd05fb8fdcdb12a
Author: Stefan Dösinger <stefandoesinger at gmx.at>
Date: Fri May 25 14:15:45 2007 +0200
wined3d: Do not enable GL_APPLE_client_storage for the dummy textures.
---
dlls/wined3d/stateblock.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index fe92d1f..4213084 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1062,6 +1062,11 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
then the default texture will kick in until replaced by a SetTexture call */
ENTER_GL();
+ if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) {
+ /* The dummy texture does not have client storage backing */
+ glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE);
+ checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)");
+ }
for (i = 0; i < GL_LIMITS(textures); i++) {
GLubyte white = 255;
@@ -1092,6 +1097,11 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white);
checkGLcall("glTexImage2D");
}
+ if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) {
+ /* Reenable because if supported it is enabled by default */
+ glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
+ checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)");
+ }
LEAVE_GL();
More information about the wine-cvs
mailing list