Skip to content

W
wine-winehq
Commit b5aee040 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Add missing GL locking to fragment_pipeline.enable_extension() implementations.

parent 91c3a5ea
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
dlls/wined3d/arb_program_shader.c
View file @ b5aee040
...@@ -2273,6 +2273,7 @@ struct arbfp_ffp_desc ...@@ -2273,6 +2273,7 @@ struct arbfp_ffp_desc
}; };
static void arbfp_enable(IWineD3DDevice *iface, BOOL enable) { static void arbfp_enable(IWineD3DDevice *iface, BOOL enable) {
ENTER_GL();
if(enable) { if(enable) {
glEnable(GL_FRAGMENT_PROGRAM_ARB); glEnable(GL_FRAGMENT_PROGRAM_ARB);
checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)");
...@@ -2280,6 +2281,7 @@ static void arbfp_enable(IWineD3DDevice *iface, BOOL enable) { ...@@ -2280,6 +2281,7 @@ static void arbfp_enable(IWineD3DDevice *iface, BOOL enable) {
glDisable(GL_FRAGMENT_PROGRAM_ARB); glDisable(GL_FRAGMENT_PROGRAM_ARB);
checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)");
} }
LEAVE_GL();
} }
static HRESULT arbfp_alloc(IWineD3DDevice *iface) { static HRESULT arbfp_alloc(IWineD3DDevice *iface) {
......
dlls/wined3d/ati_fragment_shader.c
View file @ b5aee040
...@@ -1043,6 +1043,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { ...@@ -1043,6 +1043,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = {
}; };
static void atifs_enable(IWineD3DDevice *iface, BOOL enable) { static void atifs_enable(IWineD3DDevice *iface, BOOL enable) {
ENTER_GL();
if(enable) { if(enable) {
glEnable(GL_FRAGMENT_SHADER_ATI); glEnable(GL_FRAGMENT_SHADER_ATI);
checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)");
...@@ -1050,6 +1051,7 @@ static void atifs_enable(IWineD3DDevice *iface, BOOL enable) { ...@@ -1050,6 +1051,7 @@ static void atifs_enable(IWineD3DDevice *iface, BOOL enable) {
glDisable(GL_FRAGMENT_SHADER_ATI); glDisable(GL_FRAGMENT_SHADER_ATI);
checkGLcall("glDisable(GL_FRAGMENT_SHADER_ATI)"); checkGLcall("glDisable(GL_FRAGMENT_SHADER_ATI)");
} }
LEAVE_GL();
} }
static void atifs_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct fragment_caps *caps) static void atifs_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct fragment_caps *caps)
......
dlls/wined3d/nvidia_texture_shader.c
View file @ b5aee040
...@@ -595,6 +595,7 @@ static void nvrc_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine ...@@ -595,6 +595,7 @@ static void nvrc_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine
static void nvrc_enable(IWineD3DDevice *iface, BOOL enable) { } static void nvrc_enable(IWineD3DDevice *iface, BOOL enable) { }
static void nvts_enable(IWineD3DDevice *iface, BOOL enable) { static void nvts_enable(IWineD3DDevice *iface, BOOL enable) {
ENTER_GL();
if(enable) { if(enable) {
glEnable(GL_TEXTURE_SHADER_NV); glEnable(GL_TEXTURE_SHADER_NV);
checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)");
...@@ -602,6 +603,7 @@ static void nvts_enable(IWineD3DDevice *iface, BOOL enable) { ...@@ -602,6 +603,7 @@ static void nvts_enable(IWineD3DDevice *iface, BOOL enable) {
glDisable(GL_TEXTURE_SHADER_NV); glDisable(GL_TEXTURE_SHADER_NV);
checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)");
} }
LEAVE_GL();
} }
static void nvrc_fragment_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct fragment_caps *pCaps) static void nvrc_fragment_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct fragment_caps *pCaps)
......
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