Henri Verbeet : wined3d: Remove sampled_format from IWineD3DBaseShaderClass , it isn't used anywhere.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9f2fa8ba256f8c48f1ccbf4f498c2a2729178c23
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9f2fa8ba256f8c48f1ccbf4f49...

Author: Henri Verbeet 
Date:   Wed Dec  3 14:53:43 2008 +0100

wined3d: Remove sampled_format from IWineD3DBaseShaderClass, it isn't used anywhere.

---

dlls/wined3d/arb_program_shader.c |    1 -
 dlls/wined3d/glsl_shader.c        |    1 -
 dlls/wined3d/wined3d_private.h    |    6 ------
 3 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 051f71b..44c302b 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -807,7 +807,6 @@ static void shader_arb_color_correction(const SHADER_OPCODE_ARG* arg)
     if(!recorded) {
         shader->baseShader.sampled_samplers[shader->baseShader.num_sampled_samplers] = sampler_idx;
         shader->baseShader.num_sampled_samplers++;
-        shader->baseShader.sampled_format[sampler_idx] = conversion_group;
     }

pshader_get_register_name(arg->shader, arg->dst, reg);
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 7e9353c..11f48ed 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1228,7 +1228,6 @@ static void shader_glsl_color_correction(const SHADER_OPCODE_ARG *arg)
     if(!recorded) {
         shader->baseShader.sampled_samplers[shader->baseShader.num_sampled_samplers] = sampler_idx;
         shader->baseShader.num_sampled_samplers++;
-        shader->baseShader.sampled_format[sampler_idx] = conversion_group;
     }

switch(fmt) {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index d3ac5ca..931f9b2 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2132,12 +2132,6 @@ typedef struct IWineD3DBaseShaderClass
     struct list constantsI;
     shader_reg_maps reg_maps;

-    /* Pixel formats of sampled textures, for format conversion. This
-     * represents the formats found during compilation, it is not initialized
-     * on the first parser pass. It is needed to check if the shader
-     * needs recompilation to adjust the format conversion
-     */
-    WINED3DFORMAT       sampled_format[MAX_COMBINED_SAMPLERS];
     UINT                sampled_samplers[MAX_COMBINED_SAMPLERS];
     UINT                num_sampled_samplers;