fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 15:10:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965: Don't upload clip planes when gl_ClipDistance is in use.

Browse source 
When the vertex shader writes to gl_ClipDistance, we do clipping based
on clip distances rather than user clip planes, so don't waste push
constant space storing user clip planes that won't be used.

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Paul Berry 2011-09-02 14:57:18 -07:00
parent b9ef2b85b4
commit d9cb683f81
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
View file

@ -93,7 +93,7 @@ vec4_visitor::setup_uniforms(int reg)
{
/* User clip planes from curbe:
*/
if (c->key.nr_userclip) {
if (c->key.nr_userclip && !c->key.uses_clip_distance) {
if (intel->gen >= 6) {
for (int i = 0; i < c->key.nr_userclip; i++) {
c->userplane[i] = stride(brw_vec4_grf(reg + i / 2,

1
src/mesa/drivers/dri/i965/brw_vs.c
View file

@ -256,6 +256,7 @@ static void brw_upload_vs_prog(struct brw_context *brw)
*/
key.program_string_id = vp->id;
key.nr_userclip = brw_count_bits(ctx->Transform.ClipPlanesEnabled);
key.uses_clip_distance = vp->program.UsesClipDistance;
key.copy_edgeflag = (ctx->Polygon.FrontMode != GL_FILL ||
ctx->Polygon.BackMode != GL_FILL);

1
src/mesa/drivers/dri/i965/brw_vs.h
View file

@ -49,6 +49,7 @@ struct brw_vs_prog_key {
GLuint copy_edgeflag:1;
GLuint point_coord_replace:8;
GLuint clamp_vertex_color:1;
GLuint uses_clip_distance:1;
};

15
src/mesa/drivers/dri/i965/gen6_vs_state.c
View file

@ -42,6 +42,7 @@ gen6_prepare_vs_push_constants(struct brw_context *brw)
const struct brw_vertex_program *vp =
brw_vertex_program_const(brw->vertex_program);
unsigned int nr_params = brw->vs.prog_data->nr_params / 4;
bool uses_clip_distance = vp->program.UsesClipDistance;
if (brw->vertex_program->IsNVProgram)
_mesa_load_tracked_matrices(ctx);
@ -68,12 +69,14 @@ gen6_prepare_vs_push_constants(struct brw_context *brw)
/* This should be loaded like any other param, but it's ad-hoc
* until we redo the VS backend.
*/
for (i = 0; i < MAX_CLIP_PLANES; i++) {
if (ctx->Transform.ClipPlanesEnabled & (1 << i)) {
memcpy(param, ctx->Transform._ClipUserPlane[i], 4 * sizeof(float));
param += 4;
params_uploaded++;
}
if (!uses_clip_distance) {
for (i = 0; i < MAX_CLIP_PLANES; i++) {
if (ctx->Transform.ClipPlanesEnabled & (1 << i)) {
memcpy(param, ctx->Transform._ClipUserPlane[i], 4 * sizeof(float));
param += 4;
params_uploaded++;
}
}
}
/* Align to a reg for convenience for brw_vs_emit.c */
if (params_uploaded & 1) {