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

wined3d: Fix the EXT_blend_subtract extension definitions.

This commit is contained in:
Henri Verbeet 2011-03-31 20:04:45 +02:00 committed by Alexandre Julliard
parent e4e28c47ea
commit 97a5336ca9
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wined3d/directx.c
View File

@ -105,6 +105,7 @@ static const struct {
{"GL_EXT_blend_equation_separate", EXT_BLEND_EQUATION_SEPARATE, 0 }, {"GL_EXT_blend_equation_separate", EXT_BLEND_EQUATION_SEPARATE, 0 },
{"GL_EXT_blend_func_separate", EXT_BLEND_FUNC_SEPARATE, 0 }, {"GL_EXT_blend_func_separate", EXT_BLEND_FUNC_SEPARATE, 0 },
{"GL_EXT_blend_minmax", EXT_BLEND_MINMAX, 0 }, {"GL_EXT_blend_minmax", EXT_BLEND_MINMAX, 0 },
{"GL_EXT_blend_subtract", EXT_BLEND_SUBTRACT, 0 },
{"GL_EXT_depth_bounds_test", EXT_DEPTH_BOUNDS_TEST, 0 }, {"GL_EXT_depth_bounds_test", EXT_DEPTH_BOUNDS_TEST, 0 },
{"GL_EXT_draw_buffers2", EXT_DRAW_BUFFERS2, 0 }, {"GL_EXT_draw_buffers2", EXT_DRAW_BUFFERS2, 0 },
{"GL_EXT_fog_coord", EXT_FOG_COORD, 0 }, {"GL_EXT_fog_coord", EXT_FOG_COORD, 0 },

20
dlls/wined3d/state.c
View File

@ -650,11 +650,11 @@ static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, st
switch (stateblock->state.render_states[WINED3DRS_BLENDOP]) switch (stateblock->state.render_states[WINED3DRS_BLENDOP])
{ {
case WINED3DBLENDOP_ADD : blendEquation = GL_FUNC_ADD_EXT; break; case WINED3DBLENDOP_ADD: blendEquation = GL_FUNC_ADD_EXT; break;
case WINED3DBLENDOP_SUBTRACT : blendEquation = GL_FUNC_SUBTRACT; break; case WINED3DBLENDOP_SUBTRACT: blendEquation = GL_FUNC_SUBTRACT_EXT; break;
case WINED3DBLENDOP_REVSUBTRACT : blendEquation = GL_FUNC_REVERSE_SUBTRACT; break; case WINED3DBLENDOP_REVSUBTRACT: blendEquation = GL_FUNC_REVERSE_SUBTRACT_EXT; break;
case WINED3DBLENDOP_MIN : blendEquation = GL_MIN_EXT; break; case WINED3DBLENDOP_MIN: blendEquation = GL_MIN_EXT; break;
case WINED3DBLENDOP_MAX : blendEquation = GL_MAX_EXT; break; case WINED3DBLENDOP_MAX: blendEquation = GL_MAX_EXT; break;
default: default:
FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x.\n", FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x.\n",
stateblock->state.render_states[WINED3DRS_BLENDOP]); stateblock->state.render_states[WINED3DRS_BLENDOP]);
@ -662,11 +662,11 @@ static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, st
switch (stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]) switch (stateblock->state.render_states[WINED3DRS_BLENDOPALPHA])
{ {
case WINED3DBLENDOP_ADD : blendEquationAlpha = GL_FUNC_ADD_EXT; break; case WINED3DBLENDOP_ADD: blendEquationAlpha = GL_FUNC_ADD_EXT; break;
case WINED3DBLENDOP_SUBTRACT : blendEquationAlpha = GL_FUNC_SUBTRACT; break; case WINED3DBLENDOP_SUBTRACT: blendEquationAlpha = GL_FUNC_SUBTRACT_EXT; break;
case WINED3DBLENDOP_REVSUBTRACT : blendEquationAlpha = GL_FUNC_REVERSE_SUBTRACT; break; case WINED3DBLENDOP_REVSUBTRACT: blendEquationAlpha = GL_FUNC_REVERSE_SUBTRACT_EXT; break;
case WINED3DBLENDOP_MIN : blendEquationAlpha = GL_MIN_EXT; break; case WINED3DBLENDOP_MIN: blendEquationAlpha = GL_MIN_EXT; break;
case WINED3DBLENDOP_MAX : blendEquationAlpha = GL_MAX_EXT; break; case WINED3DBLENDOP_MAX: blendEquationAlpha = GL_MAX_EXT; break;
default: default:
FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x\n", FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x\n",
stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]); stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]);

8
dlls/wined3d/wined3d_gl.h
View File

@ -1786,6 +1786,7 @@ typedef enum wined3d_gl_extension
EXT_BLEND_EQUATION_SEPARATE, EXT_BLEND_EQUATION_SEPARATE,
EXT_BLEND_FUNC_SEPARATE, EXT_BLEND_FUNC_SEPARATE,
EXT_BLEND_MINMAX, EXT_BLEND_MINMAX,
EXT_BLEND_SUBTRACT,
EXT_DRAW_BUFFERS2, EXT_DRAW_BUFFERS2,
EXT_DEPTH_BOUNDS_TEST, EXT_DEPTH_BOUNDS_TEST,
EXT_FOG_COORD, EXT_FOG_COORD,
@ -3006,6 +3007,13 @@ typedef void (WINE_GLAPI *PGLFNBLENDFUNCSEPARATEEXTPROC)(GLenum sfactorRGB, GLen
#endif #endif
typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONEXTPROC)(GLenum mode); typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONEXTPROC)(GLenum mode);
/* GL_EXT_blend_subtract */
#ifndef GL_EXT_blend_subtract
#define GL_EXT_blend_subtract 1
#define GL_FUNC_SUBTRACT_EXT 0x800a
#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800b
#endif
/* GL_EXT_depth_bounds_test */ /* GL_EXT_depth_bounds_test */
#ifndef GL_EXT_depth_bounds_test #ifndef GL_EXT_depth_bounds_test
#define GL_EXT_depth_bounds_test 1 #define GL_EXT_depth_bounds_test 1