fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 21:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gallium: remove redundant clear_color state.

Browse source
This commit is contained in:
Keith Whitwell 2007-12-11 13:19:33 +00:00
parent 48731280d0
commit 94cadef31f
18 changed files with 0 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/pipe/failover/fo_context.h
View file

@ -79,7 +79,6 @@ struct failover_context {
const struct fo_state *vertex_shader;
struct pipe_blend_color blend_color;
struct pipe_clear_color_state clear_color;
struct pipe_clip_state clip;
struct pipe_framebuffer_state framebuffer;
struct pipe_poly_stipple poly_stipple;

11
src/mesa/pipe/failover/fo_state.c
View file

@ -146,16 +146,6 @@ failover_set_clip_state( struct pipe_context *pipe,
failover->hw->set_clip_state( failover->hw, clip );
}
static void
failover_set_clear_color_state( struct pipe_context *pipe,
const struct pipe_clear_color_state *clear_color )
{
struct failover_context *failover = failover_context(pipe);
failover->clear_color = *clear_color;
failover->dirty |= FO_NEW_CLEAR_COLOR;
failover->hw->set_clear_color_state( failover->hw, clear_color );
}
static void *
failover_create_depth_stencil_state(struct pipe_context *pipe,
@ -480,7 +470,6 @@ failover_init_state_functions( struct failover_context *failover )
failover->pipe.set_blend_color = failover_set_blend_color;
failover->pipe.set_clip_state = failover_set_clip_state;
failover->pipe.set_clear_color_state = failover_set_clear_color_state;
failover->pipe.set_framebuffer_state = failover_set_framebuffer_state;
failover->pipe.set_polygon_stipple = failover_set_polygon_stipple;
failover->pipe.set_sampler_units = failover_set_sampler_units;

3
src/mesa/pipe/failover/fo_state_emit.c
View file

@ -69,9 +69,6 @@ failover_state_emit( struct failover_context *failover )
if (failover->dirty & FO_NEW_CLIP)
failover->sw->set_clip_state( failover->sw, &failover->clip );
if (failover->dirty & FO_NEW_CLEAR_COLOR)
failover->sw->set_clear_color_state( failover->sw, &failover->clear_color );
if (failover->dirty & FO_NEW_DEPTH_STENCIL)
failover->sw->bind_depth_stencil_state( failover->sw,
failover->depth_stencil->sw_state );

1
src/mesa/pipe/i915simple/i915_context.h
View file

@ -194,7 +194,6 @@ struct i915_context
const struct pipe_shader_state *fs;
struct pipe_blend_color blend_color;
struct pipe_clear_color_state clear_color;
struct pipe_clip_state clip;
struct pipe_constant_buffer constants[PIPE_SHADER_TYPES];
struct pipe_framebuffer_state framebuffer;

11
src/mesa/pipe/i915simple/i915_state.c
View file

@ -548,16 +548,6 @@ static void i915_set_framebuffer_state(struct pipe_context *pipe,
static void i915_set_clear_color_state(struct pipe_context *pipe,
const struct pipe_clear_color_state *clear)
{
struct i915_context *i915 = i915_context(pipe);
i915->clear_color = *clear; /* struct copy */
}
static void i915_set_clip_state( struct pipe_context *pipe,
const struct pipe_clip_state *clip )
{
@ -720,7 +710,6 @@ i915_init_state_functions( struct i915_context *i915 )
i915->pipe.set_blend_color = i915_set_blend_color;
i915->pipe.set_clip_state = i915_set_clip_state;
i915->pipe.set_clear_color_state = i915_set_clear_color_state;
i915->pipe.set_constant_buffer = i915_set_constant_buffer;
i915->pipe.set_framebuffer_state = i915_set_framebuffer_state;

1
src/mesa/pipe/i965simple/brw_context.h
View file

@ -475,7 +475,6 @@ struct brw_context
struct pipe_scissor_state Scissor;
struct pipe_viewport_state Viewport;
struct pipe_framebuffer_state FrameBuffer;
struct pipe_clear_color_state ClearColor;
const struct pipe_constant_buffer *Constants[2];
const struct brw_texture *Texture[PIPE_MAX_SAMPLERS];

9
src/mesa/pipe/i965simple/brw_state.c
View file

@ -377,14 +377,6 @@ static void brw_set_framebuffer_state(struct pipe_context *pipe,
static void brw_set_clear_color_state(struct pipe_context *pipe,
const struct pipe_clear_color_state *clear)
{
struct brw_context *brw = brw_context(pipe);
brw->attribs.ClearColor = *clear; /* struct copy */
}
/************************************************************************
* Rasterizer state
*/
@ -449,7 +441,6 @@ brw_init_state_functions( struct brw_context *brw )
brw->pipe.set_blend_color = brw_set_blend_color;
brw->pipe.set_clip_state = brw_set_clip_state;
brw->pipe.set_clear_color_state = brw_set_clear_color_state;
brw->pipe.set_constant_buffer = brw_set_constant_buffer;
brw->pipe.set_framebuffer_state = brw_set_framebuffer_state;

3
src/mesa/pipe/p_context.h
View file

@ -132,9 +132,6 @@ struct pipe_context {
void (*set_clip_state)( struct pipe_context *,
const struct pipe_clip_state * );
void (*set_clear_color_state)( struct pipe_context *,
const struct pipe_clear_color_state * );
void (*set_constant_buffer)( struct pipe_context *,
uint shader, uint index,
const struct pipe_constant_buffer *buf );

5
src/mesa/pipe/p_state.h
View file

@ -200,11 +200,6 @@ struct pipe_blend_color {
float color[4];
};
struct pipe_clear_color_state
{
float color[4];
};
struct pipe_framebuffer_state
{
/** multiple colorbuffers for multiple render targets */

1
src/mesa/pipe/softpipe/sp_context.c
View file

@ -304,7 +304,6 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
softpipe->pipe.set_blend_color = softpipe_set_blend_color;
softpipe->pipe.set_clip_state = softpipe_set_clip_state;
softpipe->pipe.set_clear_color_state = softpipe_set_clear_color_state;
softpipe->pipe.set_constant_buffer = softpipe_set_constant_buffer;
softpipe->pipe.set_framebuffer_state = softpipe_set_framebuffer_state;
softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple;

1
src/mesa/pipe/softpipe/sp_context.h
View file

@ -82,7 +82,6 @@ struct softpipe_context {
const struct sp_vertex_shader_state *vs;
struct pipe_blend_color blend_color;
struct pipe_clear_color_state clear_color;
struct pipe_clip_state clip;
struct pipe_constant_buffer constants[2];
struct pipe_framebuffer_state framebuffer;

3
src/mesa/pipe/softpipe/sp_state.h
View file

@ -92,9 +92,6 @@ void softpipe_set_framebuffer_state( struct pipe_context *,
void softpipe_set_blend_color( struct pipe_context *pipe,
const struct pipe_blend_color *blend_color );
void softpipe_set_clear_color_state( struct pipe_context *,
const struct pipe_clear_color_state * );
void softpipe_set_clip_state( struct pipe_context *,
const struct pipe_clip_state * );

8
src/mesa/pipe/softpipe/sp_state_surface.c
View file

@ -131,11 +131,3 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
void
softpipe_set_clear_color_state(struct pipe_context *pipe,
const struct pipe_clear_color_state *clear)
{
struct softpipe_context *softpipe = softpipe_context(pipe);
softpipe->clear_color = *clear; /* struct copy */
}

1
src/mesa/sources
View file

@ -200,7 +200,6 @@ STATETRACKER_SOURCES = \
state_tracker/st_atom.c \
state_tracker/st_atom_alphatest.c \
state_tracker/st_atom_blend.c \
state_tracker/st_atom_clear_color.c \
state_tracker/st_atom_clip.c \
state_tracker/st_atom_constbuf.c \
state_tracker/st_atom_depth.c \

1
src/mesa/state_tracker/st_atom.c
View file

@ -45,7 +45,6 @@
static const struct st_tracked_state *atoms[] =
{
&st_update_framebuffer,
&st_update_clear_color,
&st_update_depth_stencil,
&st_update_clip,

1
src/mesa/state_tracker/st_atom.h
View file

@ -46,7 +46,6 @@ void st_validate_state( struct st_context *st );
const struct st_tracked_state st_update_framebuffer;
const struct st_tracked_state st_update_clip;
const struct st_tracked_state st_update_clear_color;
const struct st_tracked_state st_update_depth_stencil;
const struct st_tracked_state st_update_shader;
const struct st_tracked_state st_update_rasterizer;

63
src/mesa/state_tracker/st_atom_clear_color.c
View file

@ -1,63 +0,0 @@
/**************************************************************************
*
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
/*
* Authors:
* Keith Whitwell <keith@tungstengraphics.com>
* Brian Paul
*/
#include "st_context.h"
#include "st_atom.h"
#include "pipe/p_context.h"
static void
update_clear_color_state( struct st_context *st )
{
struct pipe_clear_color_state clear;
clear.color[0] = st->ctx->Color.ClearColor[0];
clear.color[1] = st->ctx->Color.ClearColor[1];
clear.color[2] = st->ctx->Color.ClearColor[2];
clear.color[3] = st->ctx->Color.ClearColor[3];
if (memcmp(&clear, &st->state.clear_color, sizeof(clear)) != 0) {
st->state.clear_color = clear;
st->pipe->set_clear_color_state( st->pipe, &clear );
}
}
const struct st_tracked_state st_update_clear_color = {
.name = "st_update_clear_color",
.dirty = {
.mesa = _NEW_COLOR,
.st = 0,
},
.update = update_clear_color_state
};

1
src/mesa/state_tracker/st_context.h
View file

@ -103,7 +103,6 @@ struct st_context
const struct cso_vertex_shader *vs;
struct pipe_blend_color blend_color;
struct pipe_clear_color_state clear_color;
struct pipe_clip_state clip;
struct pipe_constant_buffer constants[2];
struct pipe_framebuffer_state framebuffer;