wined3d: Rename HIGHEST_TRANSFORMSTATE to WINED3D_HIGHEST_TRANSFORM_STATE.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
4b17bad348
commit
b3c5b7da94
|
@ -1550,7 +1550,7 @@ void CDECL wined3d_device_multiply_transform(struct wined3d_device *device,
|
|||
|
||||
TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix);
|
||||
|
||||
if (state > HIGHEST_TRANSFORMSTATE)
|
||||
if (state > WINED3D_HIGHEST_TRANSFORM_STATE)
|
||||
{
|
||||
WARN("Unhandled transform state %#x.\n", state);
|
||||
return;
|
||||
|
|
|
@ -214,7 +214,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states,
|
|||
states->streamSource = 0xffff;
|
||||
states->streamFreq = 0xffff;
|
||||
states->textures = 0xfffff;
|
||||
stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1);
|
||||
stateblock_set_bits(states->transform, WINED3D_HIGHEST_TRANSFORM_STATE + 1);
|
||||
stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1);
|
||||
for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff;
|
||||
for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe;
|
||||
|
@ -300,7 +300,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock)
|
|||
}
|
||||
}
|
||||
|
||||
for (i = 0; i <= HIGHEST_TRANSFORMSTATE >> 5; ++i)
|
||||
for (i = 0; i <= WINED3D_HIGHEST_TRANSFORM_STATE >> 5; ++i)
|
||||
{
|
||||
DWORD map = stateblock->changed.transform[i];
|
||||
for (j = 0; map; map >>= 1, ++j)
|
||||
|
|
|
@ -1446,7 +1446,7 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col
|
|||
wined3d_color->a = D3DCOLOR_B_A(d3d_color) / 255.0f;
|
||||
}
|
||||
|
||||
#define HIGHEST_TRANSFORMSTATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */
|
||||
#define WINED3D_HIGHEST_TRANSFORM_STATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */
|
||||
|
||||
void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info,
|
||||
const char *file, unsigned int line, const char *name) DECLSPEC_HIDDEN;
|
||||
|
@ -2938,7 +2938,7 @@ struct wined3d_state
|
|||
DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1];
|
||||
DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1];
|
||||
|
||||
struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1];
|
||||
struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1];
|
||||
struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES];
|
||||
struct wined3d_material material;
|
||||
struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS];
|
||||
|
@ -3000,7 +3000,7 @@ struct wined3d_stateblock_state
|
|||
DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1];
|
||||
DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1];
|
||||
|
||||
struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1];
|
||||
struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1];
|
||||
struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES];
|
||||
struct wined3d_material material;
|
||||
struct wined3d_viewport viewport;
|
||||
|
@ -3565,7 +3565,7 @@ struct wined3d_vertex_declaration
|
|||
|
||||
struct wined3d_saved_states
|
||||
{
|
||||
DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1];
|
||||
DWORD transform[(WINED3D_HIGHEST_TRANSFORM_STATE >> 5) + 1];
|
||||
WORD streamSource; /* WINED3D_MAX_STREAMS, 16 */
|
||||
WORD streamFreq; /* WINED3D_MAX_STREAMS, 16 */
|
||||
DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1];
|
||||
|
@ -3607,7 +3607,7 @@ struct wined3d_stateblock
|
|||
/* Contained state management */
|
||||
DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1];
|
||||
unsigned int num_contained_render_states;
|
||||
DWORD contained_transform_states[HIGHEST_TRANSFORMSTATE + 1];
|
||||
DWORD contained_transform_states[WINED3D_HIGHEST_TRANSFORM_STATE + 1];
|
||||
unsigned int num_contained_transform_states;
|
||||
DWORD contained_vs_consts_i[WINED3D_MAX_CONSTS_I];
|
||||
unsigned int num_contained_vs_consts_i;
|
||||
|
|
Loading…
Reference in New Issue