lib/igt_kms: Clean up the other _name functions/macros

[platform/upstream/intel-gpu-tools.git] / lib / gen6_render.h

diff --git a/lib/gen6_render.h b/lib/gen6_render.h
index 9020514..58d511f 100644 (file)
--- a/lib/gen6_render.h
+++ b/lib/gen6_render.h
@@ -152,6 +152,7 @@
 #define VB0_VERTEXDATA                 (0 << 20)
 #define VB0_INSTANCEDATA               (1 << 20)
 #define VB0_BUFFER_PITCH_SHIFT         0
+#define VB0_NULL_VERTEX_BUFFER          (1 << 13)
 
 /* VERTEX_ELEMENT_STATE Structure */
 #define VE0_VERTEX_BUFFER_INDEX_SHIFT  26 /* for GEN6 */
@@ -261,10 +262,6 @@
 #define GEN6_TS_STRG_VAL                      0x7e04
 #define GEN6_TS_RDATA                 0x7e08
 
-/* TD_CTL on gen6 is 0x7000, to not break stuff which depends on this... */
-#ifndef GEN6_TD_CTL
-#define GEN6_TD_CTL                   0x8000
-#endif
 #define GEN6_TD_CTL_MUX_SHIFT         8
 #define GEN6_TD_CTL_EXTERNAL_HALT_R0_DEBUG_MATCH          (1 << 7)
 #define GEN6_TD_CTL_FORCE_EXTERNAL_HALT                   (1 << 6)
@@ -306,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)
 
@@ -570,10 +529,6 @@
 #define GEN6_TS_STRG_VAL                      0x7e04
 #define GEN6_TS_RDATA                 0x7e08
 
-/* TD_CTL on gen6 is 0x7000, to not break stuff which depends on this... */
-#ifndef GEN6_TD_CTL
-#define GEN6_TD_CTL                   0x8000
-#endif
 #define GEN6_TD_CTL_MUX_SHIFT         8
 #define GEN6_TD_CTL_EXTERNAL_HALT_R0_DEBUG_MATCH          (1 << 7)
 #define GEN6_TD_CTL_FORCE_EXTERNAL_HALT                   (1 << 6)