Re: [Intel-gfx] [PATCH 1/2] lib/gen6_render: removed duplicate defines

2014-07-10 Thread Mika Kuoppala
Damien Lespiau  writes:

> On Thu, Jul 10, 2014 at 03:47:55PM +0300, Mika Kuoppala wrote:
>> Textually the same so no harm was done and no warnings
>> from compiler either.
>> 
>> Signed-off-by: Mika Kuoppala 
>
> Ship it!

Will do.

> (is there a patch 2/2?)

Not for public consumption, not yet. Just my fail with format-patch.
-Mika
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx


Re: [Intel-gfx] [PATCH 1/2] lib/gen6_render: removed duplicate defines

2014-07-10 Thread Damien Lespiau
On Thu, Jul 10, 2014 at 03:47:55PM +0300, Mika Kuoppala wrote:
> Textually the same so no harm was done and no warnings
> from compiler either.
> 
> Signed-off-by: Mika Kuoppala 

Ship it!

(is there a patch 2/2?)

-- 
Damien
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH 1/2] lib/gen6_render: removed duplicate defines

2014-07-10 Thread Mika Kuoppala
Textually the same so no harm was done and no warnings
from compiler either.

Signed-off-by: Mika Kuoppala 
---
 lib/gen6_render.h |   38 --
 1 file changed, 38 deletions(-)

diff --git a/lib/gen6_render.h b/lib/gen6_render.h
index 495cc2e..58d511f 100644
--- a/lib/gen6_render.h
+++ b/lib/gen6_render.h
@@ -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_ADDRESSGEN6_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_POINTERSGEN6_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_BUFFERSGEN6_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_COLORGEN6_3D(3, 1, 1)
-#define GEN6_3DSTATE_SAMPLER_PALETTE_LOAD  GEN6_3D(3, 1, 2)
-#define GEN6_3DSTATE_CHROMA_KEYGEN6_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_SHIFT18
-
-#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_PARAMSGEN6_3D(3, 1, 0xa)
-#define GEN6_3DSTATE_GS_SVB_INDEX  GEN6_3D(3, 1, 0xb)
 
 #define GEN6_PIPE_CONTROL  GEN6_3D(3, 2, 0)
 
-- 
1.7.9.5

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx