[WINED3D 1/7] Add D3DTEXTUREOP to the WINED3D namespace.
Ivan Gyurdiev
ivg231 at gmail.com
Thu Oct 12 22:33:03 CDT 2006
-------------- next part --------------
---
dlls/ddraw/device.c | 16 +-
dlls/wined3d/drawprim.c | 6 -
dlls/wined3d/stateblock.c | 4 -
dlls/wined3d/utils.c | 270 ++++++++++++++++++++--------------------
dlls/wined3d/wined3d_private.h | 4 -
include/wine/wined3d_types.h | 31 +++++
6 files changed, 181 insertions(+), 150 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index b0eccc9..5774374 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -2254,8 +2254,8 @@ IDirect3DDeviceImpl_7_SetRenderState(IDi
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG2, D3DTA_CURRENT);
- IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
- IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
+ IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, WINED3DTOP_MODULATE);
+ IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1);
break;
case D3DTBLEND_MODULATEALPHA:
@@ -2263,23 +2263,23 @@ IDirect3DDeviceImpl_7_SetRenderState(IDi
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG2, D3DTA_CURRENT);
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG2, D3DTA_CURRENT);
- IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
- IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
+ IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, WINED3DTOP_MODULATE);
+ IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, WINED3DTOP_MODULATE);
break;
case D3DTBLEND_DECAL:
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
- IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
- IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
+ IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, WINED3DTOP_SELECTARG1);
+ IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1);
break;
case D3DTBLEND_DECALALPHA:
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG2, D3DTA_CURRENT);
- IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
- IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
+ IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, WINED3DTOP_SELECTARG1);
+ IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, WINED3DTOP_MODULATE);
break;
default:
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index fad7bf8..e4c049a 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -1972,8 +1972,8 @@ static void drawPrimitiveUploadTextures(
for (i = 0; i < GL_LIMITS(texture_stages); ++i) {
INT texture_idx = -1;
- /* D3DTOP_DISABLE disables the current & any higher texture stages */
- if (This->stateBlock->textureState[i][WINED3DTSS_COLOROP] == D3DTOP_DISABLE) break;
+ /* WINED3DTOP_DISABLE disables the current & any higher texture stages */
+ if (This->stateBlock->textureState[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) break;
if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[i]) {
texture_idx = current_sampler++;
@@ -2057,7 +2057,7 @@ static void drawPrimitiveUploadTextures(
/* If we're using register combiners, set the amount of *used* combiners.
* Ie, the number of stages below the first stage to have a color op of
- * D3DTOP_DISABLE. */
+ * WINED3DTOP_DISABLE. */
if (GL_SUPPORT(NV_REGISTER_COMBINERS)) {
/* NUM_GENERAL_COMBINERS_NV should be > 0 */
if (!i) glDisable(GL_REGISTER_COMBINERS_NV);
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index c86c490..18a2ea7 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -985,10 +985,10 @@ static HRESULT WINAPI IWineD3DStateBloc
for (i = 0; i < GL_LIMITS(texture_stages); i++) {
TRACE("Setting up default texture states for texture Stage %d\n", i);
memcpy(&This->transforms[WINED3DTS_TEXTURE0 + i], &identity, sizeof(identity));
- This->textureState[i][WINED3DTSS_COLOROP ] = (i==0)? D3DTOP_MODULATE : D3DTOP_DISABLE;
+ This->textureState[i][WINED3DTSS_COLOROP ] = (i==0)? WINED3DTOP_MODULATE : WINED3DTOP_DISABLE;
This->textureState[i][WINED3DTSS_COLORARG1 ] = D3DTA_TEXTURE;
This->textureState[i][WINED3DTSS_COLORARG2 ] = D3DTA_CURRENT;
- This->textureState[i][WINED3DTSS_ALPHAOP ] = (i==0)? D3DTOP_SELECTARG1 : D3DTOP_DISABLE;
+ This->textureState[i][WINED3DTSS_ALPHAOP ] = (i==0)? WINED3DTOP_SELECTARG1 : WINED3DTOP_DISABLE;
This->textureState[i][WINED3DTSS_ALPHAARG1 ] = D3DTA_TEXTURE;
This->textureState[i][WINED3DTSS_ALPHAARG2 ] = D3DTA_CURRENT;
This->textureState[i][WINED3DTSS_BUMPENVMAT00 ] = (DWORD) 0.0;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index a810e77..2467ce3 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -572,37 +572,37 @@ #undef D3DSTATE_TO_STR
}
}
-const char* debug_d3dtop(D3DTEXTUREOP d3dtop) {
+const char* debug_d3dtop(WINED3DTEXTUREOP d3dtop) {
switch (d3dtop) {
#define D3DTOP_TO_STR(u) case u: return #u
- D3DTOP_TO_STR(D3DTOP_DISABLE);
- D3DTOP_TO_STR(D3DTOP_SELECTARG1);
- D3DTOP_TO_STR(D3DTOP_SELECTARG2);
- D3DTOP_TO_STR(D3DTOP_MODULATE);
- D3DTOP_TO_STR(D3DTOP_MODULATE2X);
- D3DTOP_TO_STR(D3DTOP_MODULATE4X);
- D3DTOP_TO_STR(D3DTOP_ADD);
- D3DTOP_TO_STR(D3DTOP_ADDSIGNED);
- D3DTOP_TO_STR(D3DTOP_SUBTRACT);
- D3DTOP_TO_STR(D3DTOP_ADDSMOOTH);
- D3DTOP_TO_STR(D3DTOP_BLENDDIFFUSEALPHA);
- D3DTOP_TO_STR(D3DTOP_BLENDTEXTUREALPHA);
- D3DTOP_TO_STR(D3DTOP_BLENDFACTORALPHA);
- D3DTOP_TO_STR(D3DTOP_BLENDTEXTUREALPHAPM);
- D3DTOP_TO_STR(D3DTOP_BLENDCURRENTALPHA);
- D3DTOP_TO_STR(D3DTOP_PREMODULATE);
- D3DTOP_TO_STR(D3DTOP_MODULATEALPHA_ADDCOLOR);
- D3DTOP_TO_STR(D3DTOP_MODULATECOLOR_ADDALPHA);
- D3DTOP_TO_STR(D3DTOP_MODULATEINVALPHA_ADDCOLOR);
- D3DTOP_TO_STR(D3DTOP_MODULATEINVCOLOR_ADDALPHA);
- D3DTOP_TO_STR(D3DTOP_BUMPENVMAP);
- D3DTOP_TO_STR(D3DTOP_BUMPENVMAPLUMINANCE);
- D3DTOP_TO_STR(D3DTOP_DOTPRODUCT3);
- D3DTOP_TO_STR(D3DTOP_MULTIPLYADD);
- D3DTOP_TO_STR(D3DTOP_LERP);
+ D3DTOP_TO_STR(WINED3DTOP_DISABLE);
+ D3DTOP_TO_STR(WINED3DTOP_SELECTARG1);
+ D3DTOP_TO_STR(WINED3DTOP_SELECTARG2);
+ D3DTOP_TO_STR(WINED3DTOP_MODULATE);
+ D3DTOP_TO_STR(WINED3DTOP_MODULATE2X);
+ D3DTOP_TO_STR(WINED3DTOP_MODULATE4X);
+ D3DTOP_TO_STR(WINED3DTOP_ADD);
+ D3DTOP_TO_STR(WINED3DTOP_ADDSIGNED);
+ D3DTOP_TO_STR(WINED3DTOP_SUBTRACT);
+ D3DTOP_TO_STR(WINED3DTOP_ADDSMOOTH);
+ D3DTOP_TO_STR(WINED3DTOP_BLENDDIFFUSEALPHA);
+ D3DTOP_TO_STR(WINED3DTOP_BLENDTEXTUREALPHA);
+ D3DTOP_TO_STR(WINED3DTOP_BLENDFACTORALPHA);
+ D3DTOP_TO_STR(WINED3DTOP_BLENDTEXTUREALPHAPM);
+ D3DTOP_TO_STR(WINED3DTOP_BLENDCURRENTALPHA);
+ D3DTOP_TO_STR(WINED3DTOP_PREMODULATE);
+ D3DTOP_TO_STR(WINED3DTOP_MODULATEALPHA_ADDCOLOR);
+ D3DTOP_TO_STR(WINED3DTOP_MODULATECOLOR_ADDALPHA);
+ D3DTOP_TO_STR(WINED3DTOP_MODULATEINVALPHA_ADDCOLOR);
+ D3DTOP_TO_STR(WINED3DTOP_MODULATEINVCOLOR_ADDALPHA);
+ D3DTOP_TO_STR(WINED3DTOP_BUMPENVMAP);
+ D3DTOP_TO_STR(WINED3DTOP_BUMPENVMAPLUMINANCE);
+ D3DTOP_TO_STR(WINED3DTOP_DOTPRODUCT3);
+ D3DTOP_TO_STR(WINED3DTOP_MULTIPLYADD);
+ D3DTOP_TO_STR(WINED3DTOP_LERP);
#undef D3DTOP_TO_STR
default:
- FIXME("Unrecognized %u D3DTOP\n", d3dtop);
+ FIXME("Unrecognized %u WINED3DTOP\n", d3dtop);
return "unrecognized";
}
}
@@ -744,18 +744,18 @@ typedef struct {
GLenum component_usage[3];
} tex_op_args;
-static BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) {
- if (op == D3DTOP_DISABLE) return FALSE;
+static BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) {
+ if (op == WINED3DTOP_DISABLE) return FALSE;
if (This->stateBlock->textures[stage]) return FALSE;
- if (arg1 == D3DTA_TEXTURE && op != D3DTOP_SELECTARG2) return TRUE;
- if (arg2 == D3DTA_TEXTURE && op != D3DTOP_SELECTARG1) return TRUE;
- if (arg3 == D3DTA_TEXTURE && (op == D3DTOP_MULTIPLYADD || op == D3DTOP_LERP)) return TRUE;
+ if (arg1 == D3DTA_TEXTURE && op != WINED3DTOP_SELECTARG2) return TRUE;
+ if (arg2 == D3DTA_TEXTURE && op != WINED3DTOP_SELECTARG1) return TRUE;
+ if (arg3 == D3DTA_TEXTURE && (op == WINED3DTOP_MULTIPLYADD || op == WINED3DTOP_LERP)) return TRUE;
return FALSE;
}
-void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx) {
+void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl*)iface;
tex_op_args tex_op_args = {{0}, {0}, {0}};
GLenum portion = is_alpha ? GL_ALPHA : GL_RGB;
@@ -768,7 +768,7 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
* passes through the result from the previous stage */
if (is_invalid_op(This, stage, op, arg1, arg2, arg3)) {
arg1 = D3DTA_CURRENT;
- op = D3DTOP_SELECTARG1;
+ op = WINED3DTOP_SELECTARG1;
}
get_src_and_opr_nvrc(stage, arg1, is_alpha, &tex_op_args.input[0],
@@ -782,9 +782,9 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
switch(op)
{
- case D3DTOP_DISABLE:
+ case WINED3DTOP_DISABLE:
/* Only for alpha */
- if (!is_alpha) ERR("Shouldn't be called for WINED3DTSS_COLOROP (D3DTOP_DISABLE)\n");
+ if (!is_alpha) ERR("Shouldn't be called for WINED3DTSS_COLOROP (WINED3DTOP_DISABLE)\n");
/* Input, prev_alpha*1 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_ALPHA));
@@ -796,10 +796,10 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_SELECTARG1:
- case D3DTOP_SELECTARG2:
+ case WINED3DTOP_SELECTARG1:
+ case WINED3DTOP_SELECTARG2:
/* Input, arg*1 */
- if (op == D3DTOP_SELECTARG1) {
+ if (op == WINED3DTOP_SELECTARG1) {
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
} else {
@@ -814,9 +814,9 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_MODULATE:
- case D3DTOP_MODULATE2X:
- case D3DTOP_MODULATE4X:
+ case WINED3DTOP_MODULATE:
+ case WINED3DTOP_MODULATE2X:
+ case WINED3DTOP_MODULATE4X:
/* Input, arg1*arg2 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
@@ -824,21 +824,21 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1]));
/* Output */
- if (op == D3DTOP_MODULATE) {
+ if (op == WINED3DTOP_MODULATE) {
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
- } else if (op == D3DTOP_MODULATE2X) {
+ } else if (op == WINED3DTOP_MODULATE2X) {
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_SCALE_BY_TWO_NV, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
- } else if (op == D3DTOP_MODULATE4X) {
+ } else if (op == WINED3DTOP_MODULATE4X) {
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV,
GL_DISCARD_NV, GL_SCALE_BY_FOUR_NV, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
}
break;
- case D3DTOP_ADD:
- case D3DTOP_ADDSIGNED:
- case D3DTOP_ADDSIGNED2X:
+ case WINED3DTOP_ADD:
+ case WINED3DTOP_ADDSIGNED:
+ case WINED3DTOP_ADDSIGNED2X:
/* Input, arg1*1+arg2*1 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
@@ -850,19 +850,19 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
/* Output */
- if (op == D3DTOP_ADD) {
+ if (op == WINED3DTOP_ADD) {
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
- } else if (op == D3DTOP_ADDSIGNED) {
+ } else if (op == WINED3DTOP_ADDSIGNED) {
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_NONE, GL_BIAS_BY_NEGATIVE_ONE_HALF_NV, GL_FALSE, GL_FALSE, GL_FALSE));
- } else if (op == D3DTOP_ADDSIGNED2X) {
+ } else if (op == WINED3DTOP_ADDSIGNED2X) {
GL_EXTCALL(glCombinerOutputNV(target, portion, GL_DISCARD_NV, GL_DISCARD_NV,
GL_SPARE0_NV, GL_SCALE_BY_TWO_NV, GL_BIAS_BY_NEGATIVE_ONE_HALF_NV, GL_FALSE, GL_FALSE, GL_FALSE));
}
break;
- case D3DTOP_SUBTRACT:
+ case WINED3DTOP_SUBTRACT:
/* Input, arg1*1+-arg2*1 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
@@ -878,7 +878,7 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_ADDSMOOTH:
+ case WINED3DTOP_ADDSMOOTH:
/* Input, arg1*1+(1-arg1)*arg2 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
@@ -894,24 +894,24 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_BLENDDIFFUSEALPHA:
- case D3DTOP_BLENDTEXTUREALPHA:
- case D3DTOP_BLENDFACTORALPHA:
- case D3DTOP_BLENDTEXTUREALPHAPM:
- case D3DTOP_BLENDCURRENTALPHA:
+ case WINED3DTOP_BLENDDIFFUSEALPHA:
+ case WINED3DTOP_BLENDTEXTUREALPHA:
+ case WINED3DTOP_BLENDFACTORALPHA:
+ case WINED3DTOP_BLENDTEXTUREALPHAPM:
+ case WINED3DTOP_BLENDCURRENTALPHA:
{
GLenum alpha_src = GL_PRIMARY_COLOR_NV;
- if (op == D3DTOP_BLENDDIFFUSEALPHA) alpha_src = d3dta_to_combiner_input(D3DTA_DIFFUSE, stage, texture_idx);
- else if (op == D3DTOP_BLENDTEXTUREALPHA) alpha_src = d3dta_to_combiner_input(D3DTA_TEXTURE, stage, texture_idx);
- else if (op == D3DTOP_BLENDFACTORALPHA) alpha_src = d3dta_to_combiner_input(D3DTA_TFACTOR, stage, texture_idx);
- else if (op == D3DTOP_BLENDTEXTUREALPHAPM) alpha_src = d3dta_to_combiner_input(D3DTA_TEXTURE, stage, texture_idx);
- else if (op == D3DTOP_BLENDCURRENTALPHA) alpha_src = d3dta_to_combiner_input(D3DTA_CURRENT, stage, texture_idx);
- else FIXME("Unhandled D3DTOP %s, shouldn't happen\n", debug_d3dtop(op));
+ if (op == WINED3DTOP_BLENDDIFFUSEALPHA) alpha_src = d3dta_to_combiner_input(D3DTA_DIFFUSE, stage, texture_idx);
+ else if (op == WINED3DTOP_BLENDTEXTUREALPHA) alpha_src = d3dta_to_combiner_input(D3DTA_TEXTURE, stage, texture_idx);
+ else if (op == WINED3DTOP_BLENDFACTORALPHA) alpha_src = d3dta_to_combiner_input(D3DTA_TFACTOR, stage, texture_idx);
+ else if (op == WINED3DTOP_BLENDTEXTUREALPHAPM) alpha_src = d3dta_to_combiner_input(D3DTA_TEXTURE, stage, texture_idx);
+ else if (op == WINED3DTOP_BLENDCURRENTALPHA) alpha_src = d3dta_to_combiner_input(D3DTA_CURRENT, stage, texture_idx);
+ else FIXME("Unhandled WINED3DTOP %s, shouldn't happen\n", debug_d3dtop(op));
/* Input, arg1*alpha_src+arg2*(1-alpha_src) */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
- if (op == D3DTOP_BLENDTEXTUREALPHAPM)
+ if (op == WINED3DTOP_BLENDTEXTUREALPHAPM)
{
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
GL_ZERO, GL_UNSIGNED_INVERT_NV, portion));
@@ -930,9 +930,9 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
break;
}
- case D3DTOP_MODULATEALPHA_ADDCOLOR:
+ case WINED3DTOP_MODULATEALPHA_ADDCOLOR:
/* Input, arg1_alpha*arg2_rgb+arg1_rgb*1 */
- if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (D3DTOP_MODULATEALPHA_ADDCOLOR)\n");
+ if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (WINED3DTOP_MODULATEALPHA_ADDCOLOR)\n");
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], GL_ALPHA));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
@@ -947,9 +947,9 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_MODULATECOLOR_ADDALPHA:
+ case WINED3DTOP_MODULATECOLOR_ADDALPHA:
/* Input, arg1_rgb*arg2_rgb+arg1_alpha*1 */
- if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (D3DTOP_MODULATECOLOR_ADDALPHA)\n");
+ if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (WINED3DTOP_MODULATECOLOR_ADDALPHA)\n");
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
@@ -964,9 +964,9 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_MODULATEINVALPHA_ADDCOLOR:
+ case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR:
/* Input, (1-arg1_alpha)*arg2_rgb+arg1_rgb*1 */
- if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (D3DTOP_MODULATEINVALPHA_ADDCOLOR)\n");
+ if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (WINED3DTOP_MODULATEINVALPHA_ADDCOLOR)\n");
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], invert_mapping(tex_op_args.mapping[0]), GL_ALPHA));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
@@ -981,9 +981,9 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_MODULATEINVCOLOR_ADDALPHA:
+ case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA:
/* Input, (1-arg1_rgb)*arg2_rgb+arg1_alpha*1 */
- if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (D3DTOP_MODULATEINVCOLOR_ADDALPHA)\n");
+ if (is_alpha) ERR("Only supported for WINED3DTSS_COLOROP (WINED3DTOP_MODULATEINVCOLOR_ADDALPHA)\n");
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], invert_mapping(tex_op_args.mapping[0]), tex_op_args.component_usage[0]));
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV,
@@ -998,7 +998,7 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_DOTPRODUCT3:
+ case WINED3DTOP_DOTPRODUCT3:
/* Input, arg1 . arg2 */
/* FIXME: DX7 uses a different calculation? */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
@@ -1011,7 +1011,7 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_DISCARD_NV, GL_NONE, GL_NONE, GL_TRUE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_MULTIPLYADD:
+ case WINED3DTOP_MULTIPLYADD:
/* Input, arg1*1+arg2*arg3 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
@@ -1027,7 +1027,7 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE));
break;
- case D3DTOP_LERP:
+ case WINED3DTOP_LERP:
/* Input, arg1*arg2+(1-arg1)*arg3 */
GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV,
tex_op_args.input[0], tex_op_args.mapping[0], tex_op_args.component_usage[0]));
@@ -1044,7 +1044,7 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa
break;
default:
- FIXME("Unhandled D3DTOP: stage %d, is_alpha %d, op %s (%#x), arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d\n",
+ FIXME("Unhandled WINED3DTOP: stage %d, is_alpha %d, op %s (%#x), arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d\n",
stage, is_alpha, debug_d3dtop(op), op, arg1, arg2, arg3, texture_idx);
}
@@ -1106,14 +1106,14 @@ # undef combine_ext
#endif
#if !defined(combine_ext)
-void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
+void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
{
FIXME("Requires opengl combine extensions to work\n");
return;
}
#else
/* Setup the texture operations texture stage states */
-void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
+void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
{
#define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info
GLenum src1, src2, src3;
@@ -1139,7 +1139,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
However, below we treat the new (a0) parameter as src2/opr2, so in the actual
functions below, expect their syntax to differ slightly to those listed in the
manuals, ie replace arg1 with arg3, arg2 with arg1 and arg3 with arg2
- This affects D3DTOP_MULTIPLYADD and D3DTOP_LERP */
+ This affects WINED3DTOP_MULTIPLYADD and WINED3DTOP_LERP */
if (isAlpha) {
comb_target = useext(GL_COMBINE_ALPHA);
@@ -1166,7 +1166,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
* passes through the result from the previous stage */
if (is_invalid_op(This, Stage, op, arg1, arg2, arg3)) {
arg1 = D3DTA_CURRENT;
- op = D3DTOP_SELECTARG1;
+ op = WINED3DTOP_SELECTARG1;
}
/* From MSDN (WINED3DTSS_ALPHAARG1) :
@@ -1199,7 +1199,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
opr3_target = GL_OPERAND3_RGB_NV;
}
switch (op) {
- case D3DTOP_DISABLE: /* Only for alpha */
+ case WINED3DTOP_DISABLE: /* Only for alpha */
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_REPLACE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, GL_PREVIOUS_EXT);
@@ -1219,11 +1219,11 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
break;
- case D3DTOP_SELECTARG1: /* = a1 * 1 + 0 * 0 */
- case D3DTOP_SELECTARG2: /* = a2 * 1 + 0 * 0 */
+ case WINED3DTOP_SELECTARG1: /* = a1 * 1 + 0 * 0 */
+ case WINED3DTOP_SELECTARG2: /* = a2 * 1 + 0 * 0 */
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
- if (op == D3DTOP_SELECTARG1) {
+ if (op == WINED3DTOP_SELECTARG1) {
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
@@ -1248,7 +1248,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
break;
- case D3DTOP_MODULATE:
+ case WINED3DTOP_MODULATE:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD"); /* Add = a0*a1 + a2*a3 */
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1270,7 +1270,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_MODULATE2X:
+ case WINED3DTOP_MODULATE2X:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD"); /* Add = a0*a1 + a2*a3 */
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1292,7 +1292,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 2);
checkGLcall("GL_TEXTURE_ENV, scal_target, 2");
break;
- case D3DTOP_MODULATE4X:
+ case WINED3DTOP_MODULATE4X:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD"); /* Add = a0*a1 + a2*a3 */
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1315,7 +1315,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
checkGLcall("GL_TEXTURE_ENV, scal_target, 4");
break;
- case D3DTOP_ADD:
+ case WINED3DTOP_ADD:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1338,7 +1338,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_ADDSIGNED:
+ case WINED3DTOP_ADDSIGNED:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1361,7 +1361,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_ADDSIGNED2X:
+ case WINED3DTOP_ADDSIGNED2X:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1384,7 +1384,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
checkGLcall("GL_TEXTURE_ENV, scal_target, 2");
break;
- case D3DTOP_ADDSMOOTH:
+ case WINED3DTOP_ADDSMOOTH:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1413,7 +1413,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_BLENDDIFFUSEALPHA:
+ case WINED3DTOP_BLENDDIFFUSEALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1435,7 +1435,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_BLENDTEXTUREALPHA:
+ case WINED3DTOP_BLENDTEXTUREALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1457,7 +1457,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_BLENDFACTORALPHA:
+ case WINED3DTOP_BLENDFACTORALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1479,7 +1479,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_BLENDTEXTUREALPHAPM:
+ case WINED3DTOP_BLENDTEXTUREALPHAPM:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1501,7 +1501,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_MODULATEALPHA_ADDCOLOR:
+ case WINED3DTOP_MODULATEALPHA_ADDCOLOR:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD"); /* Add = a0*a1 + a2*a3 */
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1); /* a0 = src1/opr1 */
@@ -1527,7 +1527,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_MODULATECOLOR_ADDALPHA:
+ case WINED3DTOP_MODULATECOLOR_ADDALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1553,7 +1553,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_MODULATEINVALPHA_ADDCOLOR:
+ case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1581,7 +1581,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_MODULATEINVCOLOR_ADDALPHA:
+ case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1613,7 +1613,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_MULTIPLYADD:
+ case WINED3DTOP_MULTIPLYADD:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src3);
@@ -1636,7 +1636,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_BUMPENVMAP:
+ case WINED3DTOP_BUMPENVMAP:
{
if (GL_SUPPORT(NV_TEXTURE_SHADER)) {
/*
@@ -1722,7 +1722,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
}
}
- case D3DTOP_BUMPENVMAPLUMINANCE:
+ case WINED3DTOP_BUMPENVMAPLUMINANCE:
default:
Handled = FALSE;
@@ -1738,7 +1738,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
Handled = TRUE; /* Again, assume handled */
switch (op) {
- case D3DTOP_DISABLE: /* Only for alpha */
+ case WINED3DTOP_DISABLE: /* Only for alpha */
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_REPLACE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_REPLACE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, GL_PREVIOUS_EXT);
@@ -1748,7 +1748,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_SELECTARG1:
+ case WINED3DTOP_SELECTARG1:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_REPLACE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_REPLACE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1758,7 +1758,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_SELECTARG2:
+ case WINED3DTOP_SELECTARG2:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_REPLACE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_REPLACE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src2);
@@ -1768,7 +1768,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_MODULATE:
+ case WINED3DTOP_MODULATE:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1782,7 +1782,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_MODULATE2X:
+ case WINED3DTOP_MODULATE2X:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1796,7 +1796,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 2);
checkGLcall("GL_TEXTURE_ENV, scal_target, 2");
break;
- case D3DTOP_MODULATE4X:
+ case WINED3DTOP_MODULATE4X:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1810,7 +1810,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 4);
checkGLcall("GL_TEXTURE_ENV, scal_target, 4");
break;
- case D3DTOP_ADD:
+ case WINED3DTOP_ADD:
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_ADD);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_ADD");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1824,7 +1824,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_ADDSIGNED:
+ case WINED3DTOP_ADDSIGNED:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext((GL_ADD_SIGNED)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1838,7 +1838,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_ADDSIGNED2X:
+ case WINED3DTOP_ADDSIGNED2X:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_ADD_SIGNED)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1852,7 +1852,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 2);
checkGLcall("GL_TEXTURE_ENV, scal_target, 2");
break;
- case D3DTOP_SUBTRACT:
+ case WINED3DTOP_SUBTRACT:
if (GL_SUPPORT(ARB_TEXTURE_ENV_COMBINE)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_SUBTRACT);
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_SUBTRACT)");
@@ -1871,7 +1871,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
}
break;
- case D3DTOP_BLENDDIFFUSEALPHA:
+ case WINED3DTOP_BLENDDIFFUSEALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1889,7 +1889,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_BLENDTEXTUREALPHA:
+ case WINED3DTOP_BLENDTEXTUREALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1907,7 +1907,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_BLENDFACTORALPHA:
+ case WINED3DTOP_BLENDFACTORALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1925,7 +1925,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_BLENDCURRENTALPHA:
+ case WINED3DTOP_BLENDCURRENTALPHA:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1943,7 +1943,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_DOTPRODUCT3:
+ case WINED3DTOP_DOTPRODUCT3:
if (GL_SUPPORT(ARB_TEXTURE_ENV_DOT3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_DOT3_RGBA_ARB);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_DOT3_RGBA_ARB");
@@ -1964,7 +1964,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_LERP:
+ case WINED3DTOP_LERP:
glTexEnvi(GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE));
checkGLcall("GL_TEXTURE_ENV, comb_target, useext(GL_INTERPOLATE)");
glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
@@ -1982,7 +1982,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
break;
- case D3DTOP_ADDSMOOTH:
+ case WINED3DTOP_ADDSMOOTH:
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
@@ -2009,7 +2009,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
} else
Handled = FALSE;
break;
- case D3DTOP_BLENDTEXTUREALPHAPM:
+ case WINED3DTOP_BLENDTEXTUREALPHAPM:
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
@@ -2030,7 +2030,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
} else
Handled = FALSE;
break;
- case D3DTOP_MODULATEALPHA_ADDCOLOR:
+ case WINED3DTOP_MODULATEALPHA_ADDCOLOR:
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
@@ -2057,7 +2057,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
} else
Handled = FALSE;
break;
- case D3DTOP_MODULATECOLOR_ADDALPHA:
+ case WINED3DTOP_MODULATECOLOR_ADDALPHA:
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
@@ -2084,7 +2084,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
} else
Handled = FALSE;
break;
- case D3DTOP_MODULATEINVALPHA_ADDCOLOR:
+ case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR:
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
@@ -2111,7 +2111,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
} else
Handled = FALSE;
break;
- case D3DTOP_MODULATEINVCOLOR_ADDALPHA:
+ case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA:
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
@@ -2144,7 +2144,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
} else
Handled = FALSE;
break;
- case D3DTOP_MULTIPLYADD:
+ case WINED3DTOP_MULTIPLYADD:
if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) {
glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI);
checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
@@ -2182,17 +2182,17 @@ #define GLINFO_LOCATION ((IWineD3DImpl *
/* Note: If COMBINE4 in effect can't go back to combine! */
switch (op2) {
- case D3DTOP_ADDSMOOTH:
- case D3DTOP_BLENDTEXTUREALPHAPM:
- case D3DTOP_MODULATEALPHA_ADDCOLOR:
- case D3DTOP_MODULATECOLOR_ADDALPHA:
- case D3DTOP_MODULATEINVALPHA_ADDCOLOR:
- case D3DTOP_MODULATEINVCOLOR_ADDALPHA:
- case D3DTOP_MULTIPLYADD:
+ case WINED3DTOP_ADDSMOOTH:
+ case WINED3DTOP_BLENDTEXTUREALPHAPM:
+ case WINED3DTOP_MODULATEALPHA_ADDCOLOR:
+ case WINED3DTOP_MODULATECOLOR_ADDALPHA:
+ case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR:
+ case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA:
+ case WINED3DTOP_MULTIPLYADD:
/* Ignore those implemented in both cases */
switch (op) {
- case D3DTOP_SELECTARG1:
- case D3DTOP_SELECTARG2:
+ case WINED3DTOP_SELECTARG1:
+ case WINED3DTOP_SELECTARG2:
combineOK = FALSE;
Handled = FALSE;
break;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8d129bd..dfdc21a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1262,8 +1262,8 @@ const char* debug_d3dpool(WINED3DPOOL po
/* Routines for GL <-> D3D values */
GLenum StencilOp(DWORD op);
GLenum CompareFunc(DWORD func);
-void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3);
-void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx);
+void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3);
+void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx);
void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords);
int D3DFmtMakeGlCfg(WINED3DFORMAT BackBufferFormat, WINED3DFORMAT StencilBufferFormat, int *attribs, int* nAttribs, BOOL alternate);
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 42afc1e..c8cf672 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -543,6 +543,37 @@ typedef enum _WINED3DTEXTURESTAGESTATETY
#define WINED3D_HIGHEST_TEXTURE_STATE WINED3DTSS_CONSTANT
+typedef enum _WINED3DTEXTUREOP {
+ WINED3DTOP_DISABLE = 1,
+ WINED3DTOP_SELECTARG1 = 2,
+ WINED3DTOP_SELECTARG2 = 3,
+ WINED3DTOP_MODULATE = 4,
+ WINED3DTOP_MODULATE2X = 5,
+ WINED3DTOP_MODULATE4X = 6,
+ WINED3DTOP_ADD = 7,
+ WINED3DTOP_ADDSIGNED = 8,
+ WINED3DTOP_ADDSIGNED2X = 9,
+ WINED3DTOP_SUBTRACT = 10,
+ WINED3DTOP_ADDSMOOTH = 11,
+ WINED3DTOP_BLENDDIFFUSEALPHA = 12,
+ WINED3DTOP_BLENDTEXTUREALPHA = 13,
+ WINED3DTOP_BLENDFACTORALPHA = 14,
+ WINED3DTOP_BLENDTEXTUREALPHAPM = 15,
+ WINED3DTOP_BLENDCURRENTALPHA = 16,
+ WINED3DTOP_PREMODULATE = 17,
+ WINED3DTOP_MODULATEALPHA_ADDCOLOR = 18,
+ WINED3DTOP_MODULATECOLOR_ADDALPHA = 19,
+ WINED3DTOP_MODULATEINVALPHA_ADDCOLOR = 20,
+ WINED3DTOP_MODULATEINVCOLOR_ADDALPHA = 21,
+ WINED3DTOP_BUMPENVMAP = 22,
+ WINED3DTOP_BUMPENVMAPLUMINANCE = 23,
+ WINED3DTOP_DOTPRODUCT3 = 24,
+ WINED3DTOP_MULTIPLYADD = 25,
+ WINED3DTOP_LERP = 26,
+
+ WINED3DTOP_FORCE_DWORD = 0x7fffffff,
+} WINED3DTEXTUREOP;
+
typedef enum _WINED3DTRANSFORMSTATETYPE {
WINED3DTS_VIEW = 2,
WINED3DTS_PROJECTION = 3,
--
1.4.2.1
More information about the wine-patches
mailing list