OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename a few structs (use _state suffix consistantly), reorder/sort fields in some structs

Browse Source
This commit is contained in:
Brian
2007-07-02 15:32:12 -06:00
parent d523a04853
commit ea92566ed9
10 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/pipe/p_context.h
View File

@@ -87,8 +87,8 @@ struct pipe_context {
void (*set_setup_state)( struct pipe_context *, void (*set_setup_state)( struct pipe_context *,
const struct pipe_setup_state * ); const struct pipe_setup_state * );
void (*set_scissor_rect)( struct pipe_context *, void (*set_scissor_state)( struct pipe_context *,
const struct pipe_scissor_rect * ); const struct pipe_scissor_state * );
void (*set_stencil_state)( struct pipe_context *, void (*set_stencil_state)( struct pipe_context *,
const struct pipe_stencil_state * ); const struct pipe_stencil_state * );
@@ -101,8 +101,8 @@ struct pipe_context {
GLuint unit, GLuint unit,
struct pipe_texture_object * ); struct pipe_texture_object * );
void (*set_viewport)( struct pipe_context *, void (*set_viewport_state)( struct pipe_context *,
const struct pipe_viewport * ); const struct pipe_viewport_state * );
}; };

4
src/mesa/pipe/p_state.h
View File

@@ -100,12 +100,12 @@ struct pipe_poly_stipple {
}; };
struct pipe_viewport { struct pipe_viewport_state {
GLfloat scale[4]; GLfloat scale[4];
GLfloat translate[4]; GLfloat translate[4];
}; };
struct pipe_scissor_rect { struct pipe_scissor_state {
GLshort minx; GLshort minx;
GLshort miny; GLshort miny;
GLshort maxx; GLshort maxx;

4
src/mesa/pipe/softpipe/sp_context.c
View File

@@ -70,9 +70,9 @@ struct pipe_context *softpipe_create( void )
softpipe->pipe.set_clip_state = softpipe_set_clip_state; softpipe->pipe.set_clip_state = softpipe_set_clip_state;
softpipe->pipe.set_clear_color_state = softpipe_set_clear_color_state; softpipe->pipe.set_clear_color_state = softpipe_set_clear_color_state;
softpipe->pipe.set_depth_state = softpipe_set_depth_test_state; softpipe->pipe.set_depth_state = softpipe_set_depth_test_state;
softpipe->pipe.set_viewport = softpipe_set_viewport; softpipe->pipe.set_viewport_state = softpipe_set_viewport_state;
softpipe->pipe.set_setup_state = softpipe_set_setup_state; softpipe->pipe.set_setup_state = softpipe_set_setup_state;
softpipe->pipe.set_scissor_rect = softpipe_set_scissor_rect; softpipe->pipe.set_scissor_state = softpipe_set_scissor_state;
softpipe->pipe.set_fs_state = softpipe_set_fs_state; softpipe->pipe.set_fs_state = softpipe_set_fs_state;
softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple; softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple;
softpipe->pipe.set_sampler_state = softpipe_set_sampler_state; softpipe->pipe.set_sampler_state = softpipe_set_sampler_state;

14
src/mesa/pipe/softpipe/sp_context.h
View File

@@ -74,19 +74,19 @@ struct softpipe_context {
/* The most recent drawing state as set by the driver: /* The most recent drawing state as set by the driver:
*/ */
struct pipe_framebuffer_state framebuffer;
struct pipe_viewport viewport;
struct pipe_setup_state setup;
struct pipe_fs_state fs;
struct pipe_blend_state blend;
struct pipe_alpha_test_state alpha_test; struct pipe_alpha_test_state alpha_test;
struct pipe_clip_state clip; struct pipe_blend_state blend;
struct pipe_clear_color_state clear_color; struct pipe_clear_color_state clear_color;
struct pipe_clip_state clip;
struct pipe_depth_state depth_test; struct pipe_depth_state depth_test;
struct pipe_scissor_rect scissor; struct pipe_framebuffer_state framebuffer;
struct pipe_fs_state fs;
struct pipe_poly_stipple poly_stipple; struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS]; struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
struct pipe_setup_state setup;
struct pipe_texture_object *texture[PIPE_MAX_SAMPLERS]; struct pipe_texture_object *texture[PIPE_MAX_SAMPLERS];
struct pipe_viewport_state viewport;
GLuint dirty; GLuint dirty;
/* Clip derived state: /* Clip derived state:

8
src/mesa/pipe/softpipe/sp_state.h
View File

@@ -53,8 +53,8 @@ void softpipe_set_clip_state( struct pipe_context *,
void softpipe_set_depth_test_state( struct pipe_context *, void softpipe_set_depth_test_state( struct pipe_context *,
const struct pipe_depth_state * ); const struct pipe_depth_state * );
void softpipe_set_viewport( struct pipe_context *, void softpipe_set_viewport_state( struct pipe_context *,
const struct pipe_viewport * ); const struct pipe_viewport_state * );
void softpipe_set_setup_state( struct pipe_context *, void softpipe_set_setup_state( struct pipe_context *,
const struct pipe_setup_state * ); const struct pipe_setup_state * );
@@ -67,8 +67,8 @@ void softpipe_set_texture_state( struct pipe_context *,
GLuint unit, GLuint unit,
struct pipe_texture_object * ); struct pipe_texture_object * );
void softpipe_set_scissor_rect( struct pipe_context *, void softpipe_set_scissor_state( struct pipe_context *,
const struct pipe_scissor_rect * ); const struct pipe_scissor_state * );
void softpipe_set_fs_state( struct pipe_context *, void softpipe_set_fs_state( struct pipe_context *,
const struct pipe_fs_state * ); const struct pipe_fs_state * );

4
src/mesa/pipe/softpipe/sp_state_clip.c
View File

@@ -51,8 +51,8 @@ void softpipe_set_clip_state( struct pipe_context *pipe,
/* Called when driver state tracker notices changes to the viewport /* Called when driver state tracker notices changes to the viewport
* matrix: * matrix:
*/ */
void softpipe_set_viewport( struct pipe_context *pipe, void softpipe_set_viewport_state( struct pipe_context *pipe,
const struct pipe_viewport *viewport ) const struct pipe_viewport_state *viewport )
{ {
struct softpipe_context *softpipe = softpipe_context(pipe); struct softpipe_context *softpipe = softpipe_context(pipe);

4
src/mesa/pipe/softpipe/sp_state_setup.c
View File

@@ -103,8 +103,8 @@ void softpipe_set_setup_state( struct pipe_context *pipe,
void softpipe_set_scissor_rect( struct pipe_context *pipe, void softpipe_set_scissor_state( struct pipe_context *pipe,
const struct pipe_scissor_rect *scissor ) const struct pipe_scissor_state *scissor )
{ {
struct softpipe_context *softpipe = softpipe_context(pipe); struct softpipe_context *softpipe = softpipe_context(pipe);

4
src/mesa/state_tracker/st_atom_scissor.c
View File

@@ -42,7 +42,7 @@
static void static void
update_scissor( struct st_context *st ) update_scissor( struct st_context *st )
{ {
struct pipe_scissor_rect scissor; struct pipe_scissor_state scissor;
const struct gl_framebuffer *fb = st->ctx->DrawBuffer; const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
scissor.minx = 0; scissor.minx = 0;
@@ -69,7 +69,7 @@ update_scissor( struct st_context *st )
if (memcmp(&scissor, &st->state.scissor, sizeof(scissor)) != 0) { if (memcmp(&scissor, &st->state.scissor, sizeof(scissor)) != 0) {
/* state has changed */ /* state has changed */
st->state.scissor = scissor; /* struct copy */ st->state.scissor = scissor; /* struct copy */
st->pipe->set_scissor_rect(st->pipe, &scissor); /* activate */ st->pipe->set_scissor_state(st->pipe, &scissor); /* activate */
} }
} }

4
src/mesa/state_tracker/st_atom_viewport.c
View File

@@ -88,7 +88,7 @@ static void update_viewport( struct st_context *st )
GLfloat half_height = ctx->Viewport.Height / 2.0; GLfloat half_height = ctx->Viewport.Height / 2.0;
GLfloat half_depth = (ctx->Viewport.Far - ctx->Viewport.Near) / 2.0; GLfloat half_depth = (ctx->Viewport.Far - ctx->Viewport.Near) / 2.0;
struct pipe_viewport vp; struct pipe_viewport_state vp;
vp.scale[0] = half_width; vp.scale[0] = half_width;
vp.scale[1] = half_height * yScale; vp.scale[1] = half_height * yScale;
@@ -102,7 +102,7 @@ static void update_viewport( struct st_context *st )
if (memcmp(&vp, &st->state.viewport, sizeof(vp)) != 0) { if (memcmp(&vp, &st->state.viewport, sizeof(vp)) != 0) {
st->state.viewport = vp; st->state.viewport = vp;
st->pipe->set_viewport(st->pipe, &vp); st->pipe->set_viewport_state(st->pipe, &vp);
} }
} }
} }

12
src/mesa/state_tracker/st_context.h
View File

@@ -65,19 +65,19 @@ struct st_context
* though, we just shove random objects across the interface. * though, we just shove random objects across the interface.
*/ */
struct { struct {
struct pipe_framebuffer_state framebuffer;
struct pipe_viewport viewport;
struct pipe_setup_state setup;
struct pipe_fs_state fs;
struct pipe_alpha_test_state alpha_test; struct pipe_alpha_test_state alpha_test;
struct pipe_blend_state blend; struct pipe_blend_state blend;
struct pipe_clear_color_state clear_color; struct pipe_clear_color_state clear_color;
struct pipe_clip_state clip; struct pipe_clip_state clip;
struct pipe_depth_state depth; struct pipe_depth_state depth;
struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS]; struct pipe_framebuffer_state framebuffer;
struct pipe_scissor_rect scissor; struct pipe_fs_state fs;
struct pipe_poly_stipple poly_stipple; struct pipe_poly_stipple poly_stipple;
struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
struct pipe_scissor_state scissor;
struct pipe_setup_state setup;
struct pipe_stencil_state stencil; struct pipe_stencil_state stencil;
struct pipe_viewport_state viewport;
} state; } state;
struct { struct {