wined3d: Get rid of the WINED3DSHADER_PARAM_REGISTER_TYPE typedef.

This commit is contained in:
Henri Verbeet 2011-11-13 19:52:27 +01:00 committed by Alexandre Julliard
parent 13efdc6a37
commit 66cb4a8ca9
3 changed files with 6 additions and 6 deletions

View File

@ -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)
{

View File

@ -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,

View File

@ -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;