Jason Green : wined3d:
Move D3DSIO_DEF instruction for ARB shaders into arb_program_shader.c.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jun 20 05:23:20 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 0b09ecb29193de406ee51c365974146355b79d2c
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b09ecb29193de406ee51c365974146355b79d2c
Author: Jason Green <jave27 at gmail.com>
Date: Mon Jun 19 17:53:38 2006 -0400
wined3d: Move D3DSIO_DEF instruction for ARB shaders into arb_program_shader.c.
---
dlls/wined3d/arb_program_shader.c | 17 +++++++++++++++++
dlls/wined3d/baseshader.c | 16 ----------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index a763196..ec6cb14 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -144,4 +144,21 @@ void shader_generate_arb_declarations(
This->baseShader.limits.constant_float - 1);
}
+/** Process the D3DSIO_DEF opcode into an ARB string - creates a local vec4
+ * float constant, and stores it's usage on the regmaps. */
+void shader_hw_def(SHADER_OPCODE_ARG* arg) {
+
+ DWORD reg = arg->dst & D3DSP_REGNUM_MASK;
+
+ shader_addline(arg->buffer,
+ "PARAM C%lu = { %f, %f, %f, %f };\n", reg,
+ *((const float *)(arg->src + 0)),
+ *((const float *)(arg->src + 1)),
+ *((const float *)(arg->src + 2)),
+ *((const float *)(arg->src + 3)) );
+
+ arg->reg_maps->constantsF[reg] = 1;
+}
+
+
/* TODO: Add more ARB_[vertex/fragment]_program specific code here */
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 004a0ef..9f0b88c 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -823,22 +823,6 @@ void shader_dump_ins_modifiers(const DWO
FIXME("_unrecognized_modifier(%#lx)", mmask >> D3DSP_DSTMOD_SHIFT);
}
-/** Process the D3DSIO_DEF opcode into an ARB string - creates a local vec4
- * float constant, and stores it's usage on the regmaps. */
-void shader_hw_def(SHADER_OPCODE_ARG* arg) {
-
- DWORD reg = arg->dst & D3DSP_REGNUM_MASK;
-
- shader_addline(arg->buffer,
- "PARAM C%lu = { %f, %f, %f, %f };\n", reg,
- *((const float *)(arg->src + 0)),
- *((const float *)(arg->src + 1)),
- *((const float *)(arg->src + 2)),
- *((const float *)(arg->src + 3)) );
-
- arg->reg_maps->constantsF[reg] = 1;
-}
-
/* First pass: trace shader, initialize length and version */
void shader_trace_init(
IWineD3DBaseShader *iface,
More information about the wine-cvs
mailing list