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

i965: Move intel_context::reduced_primitive to brw_context.

Browse source 
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Kenneth Graunke 2013-07-03 11:55:59 -07:00
parent 9147b40496
commit fe0a8cb30d
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_clip.c
View file

@ -144,7 +144,7 @@ brw_upload_clip_prog(struct brw_context *brw)
/* Populate the key:
*/
/* BRW_NEW_REDUCED_PRIMITIVE */
key.primitive = brw->intel.reduced_primitive;
key.primitive = brw->reduced_primitive;
/* BRW_NEW_VUE_MAP_GEOM_OUT */
key.attrs = brw->vue_map_geom_out.slots_valid;
/* _NEW_LIGHT */

2
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -832,6 +832,8 @@ struct brw_context
GLuint primitive; /**< Hardware primitive, such as _3DPRIM_TRILIST. */
GLenum reduced_primitive;
bool emit_state_always;
bool has_surface_tile_offset;
bool has_compr4;

4
src/mesa/drivers/dri/i965/brw_draw.c
View file

@ -114,8 +114,8 @@ static void brw_set_prim(struct brw_context *brw,
brw->primitive = hw_prim;
brw->state.dirty.brw |= BRW_NEW_PRIMITIVE;
if (reduced_prim[prim->mode] != brw->intel.reduced_primitive) {
brw->intel.reduced_primitive = reduced_prim[prim->mode];
if (reduced_prim[prim->mode] != brw->reduced_primitive) {
brw->reduced_primitive = reduced_prim[prim->mode];
brw->state.dirty.brw |= BRW_NEW_REDUCED_PRIMITIVE;
}
}

2
src/mesa/drivers/dri/i965/brw_sf.c
View file

@ -148,7 +148,7 @@ brw_upload_sf_prog(struct brw_context *brw)
key.attrs = brw->vue_map_geom_out.slots_valid;
/* BRW_NEW_REDUCED_PRIMITIVE */
switch (brw->intel.reduced_primitive) {
switch (brw->reduced_primitive) {
case GL_TRIANGLES:
/* NOTE: We just use the edgeflag attribute as an indicator that
* unfilled triangles are active. We don't actually do the

4
src/mesa/drivers/dri/i965/brw_wm.c
View file

@ -395,10 +395,10 @@ static void brw_wm_populate_key( struct brw_context *brw,
/* _NEW_LINE, _NEW_POLYGON, BRW_NEW_REDUCED_PRIMITIVE */
if (ctx->Line.SmoothFlag) {
if (brw->intel.reduced_primitive == GL_LINES) {
if (brw->reduced_primitive == GL_LINES) {
line_aa = AA_ALWAYS;
}
else if (brw->intel.reduced_primitive == GL_TRIANGLES) {
else if (brw->reduced_primitive == GL_TRIANGLES) {
if (ctx->Polygon.FrontMode == GL_LINE) {
line_aa = AA_SOMETIMES;

2
src/mesa/drivers/dri/i965/intel_context.h
View file

@ -163,8 +163,6 @@ struct intel_context
bool always_flush_cache;
bool disable_throttling;
GLenum reduced_primitive;
int driFd;
__DRIcontext *driContext;