diff options
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index c456e611e04..381fe1f9edf 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -474,7 +474,7 @@ struct brw_clip_prog_data { GLuint total_grf; }; -struct brw_gs_prog_data { +struct brw_ff_gs_prog_data { GLuint urb_read_length; GLuint total_grf; @@ -678,8 +678,8 @@ enum brw_cache_id { BRW_SF_UNIT, /* scissor state on gen6 */ BRW_VS_UNIT, BRW_VS_PROG, - BRW_GS_UNIT, - BRW_GS_PROG, + BRW_FF_GS_UNIT, + BRW_FF_GS_PROG, BRW_CLIP_VP, BRW_CLIP_UNIT, BRW_CLIP_PROG, @@ -768,8 +768,8 @@ enum shader_time_shader_type { #define CACHE_NEW_SF_UNIT (1<<BRW_SF_UNIT) #define CACHE_NEW_VS_UNIT (1<<BRW_VS_UNIT) #define CACHE_NEW_VS_PROG (1<<BRW_VS_PROG) -#define CACHE_NEW_GS_UNIT (1<<BRW_GS_UNIT) -#define CACHE_NEW_GS_PROG (1<<BRW_GS_PROG) +#define CACHE_NEW_FF_GS_UNIT (1<<BRW_FF_GS_UNIT) +#define CACHE_NEW_FF_GS_PROG (1<<BRW_FF_GS_PROG) #define CACHE_NEW_CLIP_VP (1<<BRW_CLIP_VP) #define CACHE_NEW_CLIP_UNIT (1<<BRW_CLIP_UNIT) #define CACHE_NEW_CLIP_PROG (1<<BRW_CLIP_PROG) @@ -1162,7 +1162,7 @@ struct brw_context } vs; struct { - struct brw_gs_prog_data *prog_data; + struct brw_ff_gs_prog_data *prog_data; bool prog_active; /** Offset in the program cache to the CLIP program pre-gen6 */ @@ -1171,7 +1171,7 @@ struct brw_context uint32_t bind_bo_offset; uint32_t surf_offset[BRW_MAX_GS_SURFACES]; - } gs; + } ff_gs; struct { struct brw_clip_prog_data *prog_data; |