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

wined3d: Place # of textures, addresses, & temps used inside the baseShader struct to prepare for GenerateShader merge.

Browse Source
This commit is contained in:
Jason Green 2006-05-09 22:31:09 -04:00 committed by Alexandre Julliard
parent 653e71d774
commit cc2ea9e08c
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/baseshader.c
View File

@ -96,9 +96,11 @@ const SHADER_OPCODE* shader_get_opcode(
void shader_get_registers_used( void shader_get_registers_used(
IWineD3DBaseShader *iface, IWineD3DBaseShader *iface,
CONST DWORD* pToken, CONST DWORD* pToken) {
DWORD* tempsUsed,
DWORD* texUsed) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface;
DWORD* tempsUsed = &This->baseShader.temps_used;
DWORD* texUsed = &This->baseShader.textures_used;
if (pToken == NULL) if (pToken == NULL)
return; return;

5
dlls/wined3d/pixelshader.c
View File

@ -1337,7 +1337,10 @@ inline static VOID IWineD3DPixelShaderImpl_GenerateProgramArbHW(IWineD3DPixelSha
This->constants[i] = 0; This->constants[i] = 0;
/* First pass: figure out which temporary and texture registers are used */ /* First pass: figure out which temporary and texture registers are used */
shader_get_registers_used((IWineD3DBaseShader*) This, pToken, &tempsUsed, &texUsed); shader_get_registers_used((IWineD3DBaseShader*) This, pToken);
texUsed = This->baseShader.textures_used;
tempsUsed = This->baseShader.temps_used;
TRACE("Texture registers used: %#lx, Temp registers used %#lx\n", texUsed, tempsUsed); TRACE("Texture registers used: %#lx, Temp registers used %#lx\n", texUsed, tempsUsed);
/* TODO: check register usage against GL/Directx limits, and fail if they're exceeded */ /* TODO: check register usage against GL/Directx limits, and fail if they're exceeded */

5
dlls/wined3d/vertexshader.c
View File

@ -1153,7 +1153,10 @@ inline static VOID IWineD3DVertexShaderImpl_GenerateProgramArbHW(IWineD3DVertexS
buffer.lineNo = 0; buffer.lineNo = 0;
/* First pass: figure out which temporary and texture registers are used */ /* First pass: figure out which temporary and texture registers are used */
shader_get_registers_used((IWineD3DBaseShader*) This, pToken, &tempsUsed, &addressUsed); shader_get_registers_used((IWineD3DBaseShader*) This, pToken);
addressUsed = This->baseShader.textures_used;
tempsUsed = This->baseShader.temps_used;
TRACE("Address registers used: %#lx, Temp registers used %#lx\n", addressUsed, tempsUsed); TRACE("Address registers used: %#lx, Temp registers used %#lx\n", addressUsed, tempsUsed);
/* TODO: check register usage against GL/Directx limits, and fail if they're exceeded /* TODO: check register usage against GL/Directx limits, and fail if they're exceeded

6
dlls/wined3d/wined3d_private.h
View File

@ -1260,6 +1260,8 @@ typedef struct IWineD3DBaseShaderClass
{ {
DWORD version; DWORD version;
DWORD hex_version; DWORD hex_version;
DWORD temps_used;
DWORD textures_used;
SHADER_LIMITS limits; SHADER_LIMITS limits;
SHADER_PARSE_STATE parse_state; SHADER_PARSE_STATE parse_state;
CONST SHADER_OPCODE *shader_ins; CONST SHADER_OPCODE *shader_ins;
@ -1279,9 +1281,7 @@ typedef struct IWineD3DBaseShaderImpl {
extern void shader_get_registers_used( extern void shader_get_registers_used(
IWineD3DBaseShader *iface, IWineD3DBaseShader *iface,
CONST DWORD* pToken, CONST DWORD* pToken);
DWORD* tempsUsed,
DWORD* texUsed);
extern void shader_program_dump_decl_usage( extern void shader_program_dump_decl_usage(
DWORD dcl, DWORD dcl,