Skip to content

W
wine-cw
Commit fe334f7e authored by Ofir Petruska's avatar Ofir Petruska Committed by Alexandre Julliard
Browse files
Options

Keep the checkGLcall glActiveTexture/glActiveTextureARB separation in

all the file.
parent f92bb4b7
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
dlls/d3d8/device.c
View file @ fe334f7e
...@@ -122,10 +122,11 @@ void setupTextureStates(LPDIRECT3DDEVICE8 iface, DWORD Stage, DWORD Flags) { ...@@ -122,10 +122,11 @@ void setupTextureStates(LPDIRECT3DDEVICE8 iface, DWORD Stage, DWORD Flags) {
if (GL_SUPPORT(ARB_MULTITEXTURE)) { if (GL_SUPPORT(ARB_MULTITEXTURE)) {
#if defined(GL_VERSION_1_3) #if defined(GL_VERSION_1_3)
glActiveTexture(GL_TEXTURE0 + Stage); glActiveTexture(GL_TEXTURE0 + Stage);
checkGLcall("glActiveTexture");
#else #else
glActiveTextureARB(GL_TEXTURE0_ARB + Stage); glActiveTextureARB(GL_TEXTURE0_ARB + Stage);
#endif
checkGLcall("glActiveTextureARB"); checkGLcall("glActiveTextureARB");
#endif
} else if (Stage > 0) { } else if (Stage > 0) {
FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n");
} }
...@@ -1514,8 +1515,10 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, D3DT ...@@ -1514,8 +1515,10 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, D3DT
int tex = d3dts - D3DTS_TEXTURE0; int tex = d3dts - D3DTS_TEXTURE0;
#if defined(GL_VERSION_1_3) #if defined(GL_VERSION_1_3)
glActiveTexture(GL_TEXTURE0 + tex); glActiveTexture(GL_TEXTURE0 + tex);
checkGLcall("glActiveTexture");
#else #else
glActiveTextureARB(GL_TEXTURE0_ARB + tex); glActiveTextureARB(GL_TEXTURE0_ARB + tex);
checkGLcall("glActiveTextureARB");
#endif #endif
set_texture_matrix((float *)lpmatrix, This->UpdateStateBlock->texture_state[tex][D3DTSS_TEXTURETRANSFORMFLAGS]); set_texture_matrix((float *)lpmatrix, This->UpdateStateBlock->texture_state[tex][D3DTSS_TEXTURETRANSFORMFLAGS]);
} }
...@@ -3071,10 +3074,11 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD ...@@ -3071,10 +3074,11 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD
if (GL_SUPPORT(ARB_MULTITEXTURE)) { if (GL_SUPPORT(ARB_MULTITEXTURE)) {
#if defined(GL_VERSION_1_3) #if defined(GL_VERSION_1_3)
glActiveTexture(GL_TEXTURE0 + Stage); glActiveTexture(GL_TEXTURE0 + Stage);
checkGLcall("glActiveTexture");
#else #else
glActiveTextureARB(GL_TEXTURE0_ARB + Stage); glActiveTextureARB(GL_TEXTURE0_ARB + Stage);
#endif
checkGLcall("glActiveTextureARB"); checkGLcall("glActiveTextureARB");
#endif
} else if (Stage>0) { } else if (Stage>0) {
FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment