Skip to contentSkip to conversation

lib/gen6_render: removed duplicate defines

PATCH In review Mika Kuoppala 2 participants 3 messages Jul 10, 2014 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lib/gen6_render: removed duplicate defines

Textually the same so no harm was done and no warnings from compiler either.

---
 lib/gen6_render.h |   38 --------------------------------------
 1 file changed, 38 deletions(-)
lib/gen6_render.h +0 -38
index 495cc2e..58d511f 100644
@@ -303,44 +303,6 @@
 #define GEN6_EU_ATT_CLR_1	       0x8834
 #define GEN6_EU_RDATA		       0x8840
 
-#define GEN6_3D(Pipeline,Opcode,Subopcode) ((3 << 29) | \
-					   ((Pipeline) << 27) | \
-					   ((Opcode) << 24) | \
-					   ((Subopcode) << 16))
-
-#define GEN6_STATE_BASE_ADDRESS			GEN6_3D(0, 1, 1)
-#define GEN6_STATE_SIP				GEN6_3D(0, 1, 2)
-
-#define GEN6_PIPELINE_SELECT			GEN6_3D(1, 1, 4)
-
-#define GEN6_MEDIA_STATE_POINTERS		GEN6_3D(2, 0, 0)
-#define GEN6_MEDIA_OBJECT			GEN6_3D(2, 1, 0)
-
-#define GEN6_3DSTATE_BINDING_TABLE_POINTERS	GEN6_3D(3, 0, 1)
-# define GEN6_3DSTATE_BINDING_TABLE_MODIFY_PS  (1 << 12)/* for GEN6 */
-# define GEN6_3DSTATE_BINDING_TABLE_MODIFY_GS  (1 << 9) /* for GEN6 */
-# define GEN6_3DSTATE_BINDING_TABLE_MODIFY_VS  (1 << 8) /* for GEN6 */
-
-#define GEN6_3DSTATE_VERTEX_BUFFERS		GEN6_3D(3, 0, 8)
-#define GEN6_3DSTATE_VERTEX_ELEMENTS		GEN6_3D(3, 0, 9)
-#define GEN6_3DSTATE_INDEX_BUFFER		GEN6_3D(3, 0, 0xa)
-#define GEN6_3DSTATE_VF_STATISTICS		GEN6_3D(3, 0, 0xb)
-
-#define GEN6_3DSTATE_DRAWING_RECTANGLE		GEN6_3D(3, 1, 0)
-#define GEN6_3DSTATE_CONSTANT_COLOR		GEN6_3D(3, 1, 1)
-#define GEN6_3DSTATE_SAMPLER_PALETTE_LOAD	GEN6_3D(3, 1, 2)
-#define GEN6_3DSTATE_CHROMA_KEY			GEN6_3D(3, 1, 4)
-#define GEN6_3DSTATE_DEPTH_BUFFER		GEN6_3D(3, 1, 5)
-# define GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT	29
-# define GEN6_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT	18
-
-#define GEN6_3DSTATE_POLY_STIPPLE_OFFSET		GEN6_3D(3, 1, 6)
-#define GEN6_3DSTATE_POLY_STIPPLE_PATTERN	GEN6_3D(3, 1, 7)
-#define GEN6_3DSTATE_LINE_STIPPLE		GEN6_3D(3, 1, 8)
-#define GEN6_3DSTATE_GLOBAL_DEPTH_OFFSET_CLAMP	GEN6_3D(3, 1, 9)
-/* These two are BLC and CTG only, not BW or CL */
-#define GEN6_3DSTATE_AA_LINE_PARAMS		GEN6_3D(3, 1, 0xa)
-#define GEN6_3DSTATE_GS_SVB_INDEX		GEN6_3D(3, 1, 0xb)
 
 #define GEN6_PIPE_CONTROL			GEN6_3D(3, 2, 0)
 
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 7 lines · Damien Lespiau
Quoted 4 lines · Mika Kuoppala

Textually the same so no harm was done and no warnings from compiler either.

Ship it!

Will do.

Quoted 1 line

(is there a patch 2/2?)

Not for public consumption, not yet. Just my fail with format-patch. -Mika