H. Verbeet : wined3d:
Move the D3DSIO_DCL dumping code into its own function.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 24 07:13:21 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 518de008db1169f42f66a12b6610480a2ac3641a
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=518de008db1169f42f66a12b6610480a2ac3641a
Author: H. Verbeet <hverbeet at gmail.com>
Date: Thu Mar 23 19:04:16 2006 +0000
wined3d: Move the D3DSIO_DCL dumping code into its own function.
---
dlls/wined3d/pixelshader.c | 106 ++++++++++++++++++++++---------------------
dlls/wined3d/vertexshader.c | 106 ++++++++++++++++++++++---------------------
2 files changed, 110 insertions(+), 102 deletions(-)
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 15815e2..e5311c7 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -1661,6 +1661,60 @@ inline static void pshader_program_dump_
}
}
+inline static void pshader_program_dump_decl_usage(IWineD3DPixelShaderImpl *This, DWORD token) {
+ TRACE("dcl_");
+ switch(token & 0xFFFF) {
+ case D3DDECLUSAGE_POSITION:
+ TRACE("%s%ld ", "position",(token & 0xF0000) >> 16);
+ break;
+ case D3DDECLUSAGE_BLENDINDICES:
+ TRACE("%s ", "blend");
+ break;
+ case D3DDECLUSAGE_BLENDWEIGHT:
+ TRACE("%s ", "weight");
+ break;
+ case D3DDECLUSAGE_NORMAL:
+ TRACE("%s%ld ", "normal",(token & 0xF0000) >> 16);
+ break;
+ case D3DDECLUSAGE_PSIZE:
+ TRACE("%s ", "psize");
+ break;
+ case D3DDECLUSAGE_COLOR:
+ if((token & 0xF0000) >> 16 == 0) {
+ TRACE("%s ", "color");
+ } else {
+ TRACE("%s%ld ", "specular", ((token & 0xF0000) >> 16) - 1);
+ }
+ break;
+ case D3DDECLUSAGE_TEXCOORD:
+ TRACE("%s%ld ", "texture", (token & 0xF0000) >> 16);
+ break;
+ case D3DDECLUSAGE_TANGENT:
+ TRACE("%s ", "tangent");
+ break;
+ case D3DDECLUSAGE_BINORMAL:
+ TRACE("%s ", "binormal");
+ break;
+ case D3DDECLUSAGE_TESSFACTOR:
+ TRACE("%s ", "tessfactor");
+ break;
+ case D3DDECLUSAGE_POSITIONT:
+ TRACE("%s%ld ", "positionT",(token & 0xF0000) >> 16);
+ break;
+ case D3DDECLUSAGE_FOG:
+ TRACE("%s ", "fog");
+ break;
+ case D3DDECLUSAGE_DEPTH:
+ TRACE("%s ", "depth");
+ break;
+ case D3DDECLUSAGE_SAMPLE:
+ TRACE("%s ", "sample");
+ break;
+ default:
+ FIXME("Unrecognised dcl %08lx", token & 0xFFFF);
+ }
+}
+
HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *iface, CONST DWORD *pFunction) {
IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface;
const DWORD* pToken = pFunction;
@@ -1706,57 +1760,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S
} else {
if (curOpcode->opcode == D3DSIO_DCL) {
- TRACE("dcl_");
- switch(*pToken & 0xFFFF) {
- case D3DDECLUSAGE_POSITION:
- TRACE("%s%ld ", "position",(*pToken & 0xF0000) >> 16);
- break;
- case D3DDECLUSAGE_BLENDINDICES:
- TRACE("%s ", "blend");
- break;
- case D3DDECLUSAGE_BLENDWEIGHT:
- TRACE("%s ", "weight");
- break;
- case D3DDECLUSAGE_NORMAL:
- TRACE("%s%ld ", "normal",(*pToken & 0xF0000) >> 16);
- break;
- case D3DDECLUSAGE_PSIZE:
- TRACE("%s ", "psize");
- break;
- case D3DDECLUSAGE_COLOR:
- if((*pToken & 0xF0000) >> 16 == 0) {
- TRACE("%s ", "color");
- } else {
- TRACE("%s%ld ", "specular", ((*pToken & 0xF0000) >> 16) - 1);
- }
- break;
- case D3DDECLUSAGE_TEXCOORD:
- TRACE("%s%ld ", "texture", (*pToken & 0xF0000) >> 16);
- break;
- case D3DDECLUSAGE_TANGENT:
- TRACE("%s ", "tangent");
- break;
- case D3DDECLUSAGE_BINORMAL:
- TRACE("%s ", "binormal");
- break;
- case D3DDECLUSAGE_TESSFACTOR:
- TRACE("%s ", "tessfactor");
- break;
- case D3DDECLUSAGE_POSITIONT:
- TRACE("%s%ld ", "positionT",(*pToken & 0xF0000) >> 16);
- break;
- case D3DDECLUSAGE_FOG:
- TRACE("%s ", "fog");
- break;
- case D3DDECLUSAGE_DEPTH:
- TRACE("%s ", "depth");
- break;
- case D3DDECLUSAGE_SAMPLE:
- TRACE("%s ", "sample");
- break;
- default:
- FIXME("Unrecognised dcl %08lx", *pToken & 0xFFFF);
- }
+ pshader_program_dump_decl_usage(This, *pToken);
++pToken;
++len;
pshader_program_dump_ps_param(*pToken, 0);
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index c4732bc..13da61c 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -879,6 +879,60 @@ inline static void vshader_program_dump_
}
}
+inline static void vshader_program_dump_decl_usage(IWineD3DVertexShaderImpl *This, DWORD token) {
+ TRACE("dcl_");
+ switch(token & 0xFFFF) {
+ case D3DDECLUSAGE_POSITION:
+ TRACE("%s%ld ", "position",(token & 0xF0000) >> 16);
+ break;
+ case D3DDECLUSAGE_BLENDINDICES:
+ TRACE("%s ", "blend");
+ break;
+ case D3DDECLUSAGE_BLENDWEIGHT:
+ TRACE("%s ", "weight");
+ break;
+ case D3DDECLUSAGE_NORMAL:
+ TRACE("%s%ld ", "normal",(token & 0xF0000) >> 16);
+ break;
+ case D3DDECLUSAGE_PSIZE:
+ TRACE("%s ", "psize");
+ break;
+ case D3DDECLUSAGE_COLOR:
+ if((token & 0xF0000) >> 16 == 0) {
+ TRACE("%s ", "color");
+ } else {
+ TRACE("%s ", "specular");
+ }
+ break;
+ case D3DDECLUSAGE_TEXCOORD:
+ TRACE("%s%ld ", "texture", (token & 0xF0000) >> 16);
+ break;
+ case D3DDECLUSAGE_TANGENT:
+ TRACE("%s ", "tangent");
+ break;
+ case D3DDECLUSAGE_BINORMAL:
+ TRACE("%s ", "binormal");
+ break;
+ case D3DDECLUSAGE_TESSFACTOR:
+ TRACE("%s ", "tessfactor");
+ break;
+ case D3DDECLUSAGE_POSITIONT:
+ TRACE("%s%ld ", "positionT",(token & 0xF0000) >> 16);
+ break;
+ case D3DDECLUSAGE_FOG:
+ TRACE("%s ", "fog");
+ break;
+ case D3DDECLUSAGE_DEPTH:
+ TRACE("%s ", "depth");
+ break;
+ case D3DDECLUSAGE_SAMPLE:
+ TRACE("%s ", "sample");
+ break;
+ default:
+ FIXME("Unrecognised dcl %08lx", token & 0xFFFF);
+ }
+}
+
inline static BOOL vshader_is_version_token(DWORD token) {
return 0xFFFE0000 == (token & 0xFFFE0000);
}
@@ -2102,57 +2156,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_
} else {
if (curOpcode->opcode == D3DSIO_DCL) {
- TRACE("dcl_");
- switch(*pToken & 0xFFFF) {
- case D3DDECLUSAGE_POSITION:
- TRACE("%s%ld ", "position",(*pToken & 0xF0000) >> 16);
- break;
- case D3DDECLUSAGE_BLENDINDICES:
- TRACE("%s ", "blend");
- break;
- case D3DDECLUSAGE_BLENDWEIGHT:
- TRACE("%s ", "weight");
- break;
- case D3DDECLUSAGE_NORMAL:
- TRACE("%s%ld ", "normal",(*pToken & 0xF0000) >> 16);
- break;
- case D3DDECLUSAGE_PSIZE:
- TRACE("%s ", "psize");
- break;
- case D3DDECLUSAGE_COLOR:
- if((*pToken & 0xF0000) >> 16 == 0) {
- TRACE("%s ", "color");
- } else {
- TRACE("%s ", "specular");
- }
- break;
- case D3DDECLUSAGE_TEXCOORD:
- TRACE("%s%ld ", "texture", (*pToken & 0xF0000) >> 16);
- break;
- case D3DDECLUSAGE_TANGENT:
- TRACE("%s ", "tangent");
- break;
- case D3DDECLUSAGE_BINORMAL:
- TRACE("%s ", "binormal");
- break;
- case D3DDECLUSAGE_TESSFACTOR:
- TRACE("%s ", "tessfactor");
- break;
- case D3DDECLUSAGE_POSITIONT:
- TRACE("%s%ld ", "positionT",(*pToken & 0xF0000) >> 16);
- break;
- case D3DDECLUSAGE_FOG:
- TRACE("%s ", "fog");
- break;
- case D3DDECLUSAGE_DEPTH:
- TRACE("%s ", "depth");
- break;
- case D3DDECLUSAGE_SAMPLE:
- TRACE("%s ", "sample");
- break;
- default:
- FIXME("Unrecognised dcl %08lx", *pToken & 0xFFFF);
- }
+ vshader_program_dump_decl_usage(This, *pToken);
++pToken;
++len;
vshader_program_dump_vs_param(*pToken, 0);
More information about the wine-cvs
mailing list