Henri Verbeet : wined3d: Rename "shader_backend_t" to " wined3d_shader_backend_ops".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 86b0c6bd7b7bef045730e79e91fb51619a854682
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=86b0c6bd7b7bef045730e79e91...

Author: Henri Verbeet 
Date:   Wed May  4 22:18:46 2011 +0200

wined3d: Rename "shader_backend_t" to "wined3d_shader_backend_ops".

This makes it more consistent with the other call table names in wined3d.

---

dlls/wined3d/arb_program_shader.c |    3 ++-
 dlls/wined3d/directx.c            |    2 +-
 dlls/wined3d/glsl_shader.c        |    3 ++-
 dlls/wined3d/shader.c             |    3 ++-
 dlls/wined3d/wined3d_private.h    |   15 ++++++++-------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index e3bb562..53c187a 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5465,7 +5465,8 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio
     shader_arb_add_instruction_modifiers(ins);
 }

-const shader_backend_t arb_program_shader_backend = {
+const struct wined3d_shader_backend_ops arb_program_shader_backend =
+{
     shader_arb_handle_instruction,
     shader_arb_select,
     shader_arb_select_depth_blt,
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 1b593ce..69a0673 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2071,7 +2071,7 @@ static const struct fragment_pipeline *select_fragment_implementation(struct win
     else return &ffp_fragment_pipeline;
 }

-static const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter)
+static const struct wined3d_shader_backend_ops *select_shader_backend(struct wined3d_adapter *adapter)
 {
     int vs_selected_mode, ps_selected_mode;

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 7bda045..6948ec3 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5119,7 +5119,8 @@ static void shader_glsl_handle_instruction(const struct wined3d_shader_instructi
     shader_glsl_add_instruction_modifiers(ins);
 }

-const shader_backend_t glsl_shader_backend = {
+const struct wined3d_shader_backend_ops glsl_shader_backend =
+{
     shader_glsl_handle_instruction,
     shader_glsl_select,
     shader_glsl_select_depth_blt,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 7f6e95b..6c8a224 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1528,7 +1528,8 @@ static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup)
     return FALSE;
 }

-const shader_backend_t none_shader_backend = {
+const struct wined3d_shader_backend_ops none_shader_backend =
+{
     shader_none_handle_instruction,
     shader_none_select,
     shader_none_select_depth_blt,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 955595c..8606004 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -742,7 +742,8 @@ struct vs_compile_args {
 struct wined3d_context;
 struct wined3d_state;

-typedef struct {
+struct wined3d_shader_backend_ops
+{
     void (*shader_handle_instruction)(const struct wined3d_shader_instruction *);
     void (*shader_select)(const struct wined3d_context *context, BOOL usePS, BOOL useVS);
     void (*shader_select_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info,
@@ -759,11 +760,11 @@ typedef struct {
     BOOL (*shader_dirtifyable_constants)(void);
     void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps);
     BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup);
-} shader_backend_t;
+};

-extern const shader_backend_t glsl_shader_backend DECLSPEC_HIDDEN;
-extern const shader_backend_t arb_program_shader_backend DECLSPEC_HIDDEN;
-extern const shader_backend_t none_shader_backend DECLSPEC_HIDDEN;
+extern const struct wined3d_shader_backend_ops glsl_shader_backend DECLSPEC_HIDDEN;
+extern const struct wined3d_shader_backend_ops arb_program_shader_backend DECLSPEC_HIDDEN;
+extern const struct wined3d_shader_backend_ops none_shader_backend DECLSPEC_HIDDEN;

/* X11 locking */

@@ -1532,7 +1533,7 @@ struct wined3d_adapter
     LUID luid;

const struct fragment_pipeline *fragment_pipe;
-    const shader_backend_t *shader_backend;
+    const struct wined3d_shader_backend_ops *shader_backend;
     const struct blit_shader *blitter;
 };

@@ -1659,7 +1660,7 @@ struct IWineD3DDeviceImpl
     /* Selected capabilities */
     int vs_selected_mode;
     int ps_selected_mode;
-    const shader_backend_t *shader_backend;
+    const struct wined3d_shader_backend_ops *shader_backend;
     void *shader_priv;
     void *fragment_priv;
     void *blit_priv;