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

gallium: remove point_size_min and point_size_max from rasterizer state

Browse Source 
The state tracker is responsible for clamping to any graphics API enforced
size min/max limits for both the static point_size setting as well as per
vertex point size (in the vertex shader).
Note that mesa state tracker didn't actually use these values.
This commit is contained in:
Roland Scheidegger
2010-01-12 15:54:13 +01:00
parent cca66dbb59
commit a407636efb
11 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/auxiliary/draw/draw_pipe_wide_point.c
View File

@@ -64,8 +64,6 @@ struct widepoint_stage {
struct draw_stage stage;
float half_point_size;
float point_size_min;
float point_size_max;
float xbias;
float ybias;
@@ -151,13 +149,6 @@ static void widepoint_point( struct draw_stage *stage,
/* point size is either per-vertex or fixed size */
if (wide->psize_slot >= 0) {
half_size = header->v[0]->data[wide->psize_slot][0];
/* XXX: temporary -- do this in the vertex shader??
*/
half_size = CLAMP(half_size,
wide->point_size_min,
wide->point_size_max);
half_size *= 0.5f;
}
else {
@@ -222,8 +213,6 @@ static void widepoint_first_point( struct draw_stage *stage,
struct draw_context *draw = stage->draw;
wide->half_point_size = 0.5f * draw->rasterizer->point_size;
wide->point_size_min = draw->rasterizer->point_size_min;
wide->point_size_max = draw->rasterizer->point_size_max;
wide->xbias = 0.0;
wide->ybias = 0.0;

4
src/gallium/docs/source/cso/rasterizer.rst
View File

@@ -82,10 +82,6 @@ point_size_per_vertex
Whether vertices have a point size element.
point_size
The size of points, if not specified per-vertex.
point_size_min
The minimum size of points.
point_size_max
The maximum size of points.
point_sprite
Whether points are drawn as sprites (textured quads)
sprite_coord_mode

4
src/gallium/drivers/i965/brw_sf_state.c
View File

@@ -126,9 +126,7 @@ sf_unit_populate_key(struct brw_context *brw, struct brw_sf_unit_key *key)
key->point_sprite = rast->point_sprite;
key->point_attenuated = rast->point_size_per_vertex;
key->point_size = CLAMP(rast->point_size,
rast->point_size_min,
rast->point_size_max);
key->point_size = rast->point_size;
}
static enum pipe_error

6
src/gallium/drivers/r300/r300_state.c
View File

@@ -618,10 +618,12 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
rs->point_size = pack_float_16_6x(state->point_size) |
(pack_float_16_6x(state->point_size) << R300_POINTSIZE_X_SHIFT);
/* set hw limits - clamping done by state tracker in vs or point_size
XXX always need to emit this? */
rs->point_minmax =
((int)(state->point_size_min * 6.0) <<
((int)(0.0 * 6.0) <<
R300_GA_POINT_MINMAX_MIN_SHIFT) |
((int)(state->point_size_max * 6.0) <<
((int)(4096.0 * 6.0) <<
R300_GA_POINT_MINMAX_MAX_SHIFT);
rs->line_control = pack_float_16_6x(state->line_width) |

3
src/gallium/drivers/svga/svga_context.h
View File

@@ -37,6 +37,7 @@
#define SVGA_TEX_UNITS 8
#define SVGA_MAX_POINTSIZE 80.0
struct draw_vertex_shader;
struct svga_shader_result;
@@ -145,8 +146,6 @@ struct svga_rasterizer_state {
float slopescaledepthbias;
float depthbias;
float pointsize;
float pointsize_min;
float pointsize_max;
unsigned hw_unfilled:16; /* PIPE_POLYGON_MODE_x */
unsigned need_pipeline:16; /* which prims do we need help for? */

2
src/gallium/drivers/svga/svga_pipe_rasterizer.c
View File

@@ -88,8 +88,6 @@ svga_create_rasterizer_state(struct pipe_context *pipe,
rast->antialiasedlineenable = templ->line_smooth;
rast->lastpixel = templ->line_last_pixel;
rast->pointsize = templ->point_size;
rast->pointsize_min = templ->point_size_min;
rast->pointsize_max = templ->point_size_max;
rast->hw_unfilled = PIPE_POLYGON_MODE_FILL;
/* Use swtnl + decomposition implement these:

2
src/gallium/drivers/svga/svga_screen.c
View File

@@ -103,7 +103,7 @@ svga_get_paramf(struct pipe_screen *screen, int param)
/* Keep this to a reasonable size to avoid failures in
* conform/pntaa.c:
*/
return 80.0;
return SVGA_MAX_POINTSIZE;
case PIPE_CAP_MAX_TEXTURE_ANISOTROPY:
return 4.0;

5
src/gallium/drivers/svga/svga_state_rss.c
View File

@@ -196,8 +196,9 @@ static int emit_rss( struct svga_context *svga,
EMIT_RS( svga, curr->lastpixel, LASTPIXEL, fail );
EMIT_RS( svga, curr->linepattern, LINEPATTERN, fail );
EMIT_RS_FLOAT( svga, curr->pointsize, POINTSIZE, fail );
EMIT_RS_FLOAT( svga, curr->pointsize_min, POINTSIZEMIN, fail );
EMIT_RS_FLOAT( svga, curr->pointsize_max, POINTSIZEMAX, fail );
/* XXX still need to set this? */
EMIT_RS_FLOAT( svga, 0.0, POINTSIZEMIN, fail );
EMIT_RS_FLOAT( svga, SVGA_MAX_POINTSIZE, POINTSIZEMAX, fail );
}
if (dirty & (SVGA_NEW_RAST | SVGA_NEW_FRAME_BUFFER | SVGA_NEW_NEED_PIPELINE))

2
src/gallium/drivers/trace/tr_dump_state.c
View File

@@ -126,8 +126,6 @@ void trace_dump_rasterizer_state(const struct pipe_rasterizer_state *state)
trace_dump_member(float, state, line_width);
trace_dump_member(float, state, point_size);
trace_dump_member(float, state, point_size_min);
trace_dump_member(float, state, point_size_max);
trace_dump_member(float, state, offset_units);
trace_dump_member(float, state, offset_scale);

2
src/gallium/include/pipe/p_state.h
View File

@@ -141,8 +141,6 @@ struct pipe_rasterizer_state
float line_width;
float point_size; /**< used when no per-vertex size */
float point_size_min; /* XXX - temporary, will go away */
float point_size_max; /* XXX - temporary, will go away */
float offset_units;
float offset_scale;
ubyte sprite_coord_mode[PIPE_MAX_SHADER_OUTPUTS]; /**< PIPE_SPRITE_COORD_ */

3
src/mesa/state_tracker/st_atom_rasterizer.c
View File

@@ -188,9 +188,6 @@ static void update_raster_state( struct st_context *st )
*/
raster->point_size = ctx->Point.Size;
raster->point_size_min = 0; /* temporary, will go away */
raster->point_size_max = 1000; /* temporary, will go away */
raster->point_smooth = ctx->Point.SmoothFlag;
raster->point_sprite = ctx->Point.PointSprite;
for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {