[PATCH 4/5] wined3d: Get rid of the WINED3DSHADER_PARAM_REGISTER_TYPE typedef.
Henri Verbeet
hverbeet at codeweavers.com
Sun Nov 13 12:52:27 CST 2011
---
dlls/wined3d/shader.c | 2 +-
dlls/wined3d/shader_sm4.c | 4 ++--
dlls/wined3d/wined3d_private.h | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 42c71ed..24b577a 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -311,7 +311,7 @@ static void shader_init(struct wined3d_shader *shader, struct wined3d_device *de
/* Convert floating point offset relative to a register file to an absolute
* offset for float constants. */
-static unsigned int shader_get_float_offset(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx)
+static unsigned int shader_get_float_offset(enum wined3d_shader_register_type register_type, UINT register_idx)
{
switch (register_type)
{
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 19f8c30..f6c3ec1 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -127,7 +127,7 @@ struct wined3d_sm4_opcode_info
struct sysval_map
{
enum wined3d_sysval_semantic sysval;
- WINED3DSHADER_PARAM_REGISTER_TYPE register_type;
+ enum wined3d_shader_register_type register_type;
UINT register_idx;
};
@@ -173,7 +173,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1},
};
-static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] =
+static const enum wined3d_shader_register_type register_type_table[] =
{
/* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP,
/* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 11e0297..d36c017 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -286,7 +286,7 @@ enum wined3d_sampler_texture_type
WINED3DSTT_VOLUME = 4,
};
-typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE
+enum wined3d_shader_register_type
{
WINED3DSPR_TEMP = 0,
WINED3DSPR_INPUT = 1,
@@ -314,7 +314,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE
WINED3DSPR_CONSTBUFFER,
WINED3DSPR_NULL,
WINED3DSPR_RESOURCE,
-} WINED3DSHADER_PARAM_REGISTER_TYPE;
+};
enum wined3d_immconst_type
{
@@ -597,7 +597,7 @@ struct wined3d_shader_context
struct wined3d_shader_register
{
- WINED3DSHADER_PARAM_REGISTER_TYPE type;
+ enum wined3d_shader_register_type type;
UINT idx;
UINT array_idx;
const struct wined3d_shader_src_param *rel_addr;
--
1.7.3.4
More information about the wine-patches
mailing list