diff options
| author | Paul Berry <[email protected]> | 2013-10-23 10:59:57 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-10-24 22:00:13 -0700 |
| commit | 11634e491bf6d7d930f00c5b4f62fd4e8cb4314d (patch) | |
| tree | cb142dcb12b6b31ab88e545f40686650e6374286 /src/mesa/drivers/dri | |
| parent | 44b7ebe52d6f4b220a1c943bac2e571bb593f7e1 (diff) | |
glsl: Move UsesClipDistance from gl_{vertex,geometry}_program into gl_program.
This will make it easier for back-ends to share code between geometry
shader and vertex shader compilation. Also, it is renamed to
"UsesClipDistanceOut" to clarify that (a) in geometry shaders, it
refers to the gl_ClipDistance output rather than the gl_ClipDistance
input, and (b) it is irrelevant in fragment shaders.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_gs.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.c b/src/mesa/drivers/dri/i965/brw_vec4_gs.c index b48422c5001..e00a10431a4 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs.c +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs.c @@ -267,7 +267,8 @@ brw_upload_gs_prog(struct brw_context *brw) memset(&key, 0, sizeof(key)); key.base.program_string_id = gp->id; - brw_setup_vec4_key_clip_info(brw, &key.base, gp->program.UsesClipDistance); + brw_setup_vec4_key_clip_info(brw, &key.base, + gp->program.Base.UsesClipDistanceOut); /* _NEW_LIGHT | _NEW_BUFFERS */ key.base.clamp_vertex_color = ctx->Light._ClampVertexColor; diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index c0ae3edbe06..04cf857c98d 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -420,7 +420,8 @@ static void brw_upload_vs_prog(struct brw_context *brw) * the inputs it asks for, whether they are varying or not. */ key.base.program_string_id = vp->id; - brw_setup_vec4_key_clip_info(brw, &key.base, vp->program.UsesClipDistance); + brw_setup_vec4_key_clip_info(brw, &key.base, + vp->program.Base.UsesClipDistanceOut); /* _NEW_POLYGON */ if (brw->gen < 6) { |