[igt-dev] [PATCH i-g-t v2 2/2] lib/i915: Move shaders directory

[Katarzyna Dec <katarzyna.dec@intel.com>]

In shaders/ directory we got Intel specific information. As igt
is a project for more vendors, let's move this directory to
lib/i915.

v2: Changed shaders directory path in library files comments.

Signed-off-by: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Kalamarz Lukasz <lukasz.kalamarz@intel.com>
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 lib/gpgpu_fill.c                                        | 2 +-
 {shaders => lib/i915/shaders}/README                    | 0
 {shaders => lib/i915/shaders}/converter.py              | 0
 {shaders => lib/i915/shaders}/gpgpu/gpgpu_fill.gxa      | 0
 {shaders => lib/i915/shaders}/gpgpu/gpgpu_fill_gen8.asm | 0
 {shaders => lib/i915/shaders}/gpgpu/gpgpu_fill_gen9.asm | 0
 {shaders => lib/i915/shaders}/media/media_fill.gxa      | 0
 {shaders => lib/i915/shaders}/media/media_fill_gen8.asm | 0
 {shaders => lib/i915/shaders}/ps/blit.g7a               | 0
 {shaders => lib/i915/shaders}/ps/blit_gen8.asm          | 0
 {shaders => lib/i915/shaders}/ps/neg1_gen8.asm          | 0
 {shaders => lib/i915/shaders}/ps/neg1_test.g7a          | 0
 lib/rendercopy_gen8.c                                   | 2 +-
 lib/rendercopy_gen9.c                                   | 2 +-
 14 files changed, 3 insertions(+), 3 deletions(-)
 rename {shaders => lib/i915/shaders}/README (100%)
 rename {shaders => lib/i915/shaders}/converter.py (100%)
 rename {shaders => lib/i915/shaders}/gpgpu/gpgpu_fill.gxa (100%)
 rename {shaders => lib/i915/shaders}/gpgpu/gpgpu_fill_gen8.asm (100%)
 rename {shaders => lib/i915/shaders}/gpgpu/gpgpu_fill_gen9.asm (100%)
 rename {shaders => lib/i915/shaders}/media/media_fill.gxa (100%)
 rename {shaders => lib/i915/shaders}/media/media_fill_gen8.asm (100%)
 rename {shaders => lib/i915/shaders}/ps/blit.g7a (100%)
 rename {shaders => lib/i915/shaders}/ps/blit_gen8.asm (100%)
 rename {shaders => lib/i915/shaders}/ps/neg1_gen8.asm (100%)
 rename {shaders => lib/i915/shaders}/ps/neg1_test.g7a (100%)

diff --git a/lib/gpgpu_fill.c b/lib/gpgpu_fill.c
index af2935ab..003f4616 100644
--- a/lib/gpgpu_fill.c
+++ b/lib/gpgpu_fill.c
@@ -34,7 +34,7 @@
 #include "gpgpu_fill.h"
 #include "gpu_cmds.h"
 
-/* shaders/gpgpu/gpgpu_fill.gxa */
+/* lib/i915/shaders/gpgpu/gpgpu_fill.gxa */
 static const uint32_t gen7_gpgpu_kernel[][4] = {
 	{ 0x00400001, 0x20200231, 0x00000020, 0x00000000 },
 	{ 0x00000041, 0x20400c21, 0x00000004, 0x00000010 },
diff --git a/shaders/README b/lib/i915/shaders/README
similarity index 100%
rename from shaders/README
rename to lib/i915/shaders/README
diff --git a/shaders/converter.py b/lib/i915/shaders/converter.py
similarity index 100%
rename from shaders/converter.py
rename to lib/i915/shaders/converter.py
diff --git a/shaders/gpgpu/gpgpu_fill.gxa b/lib/i915/shaders/gpgpu/gpgpu_fill.gxa
similarity index 100%
rename from shaders/gpgpu/gpgpu_fill.gxa
rename to lib/i915/shaders/gpgpu/gpgpu_fill.gxa
diff --git a/shaders/gpgpu/gpgpu_fill_gen8.asm b/lib/i915/shaders/gpgpu/gpgpu_fill_gen8.asm
similarity index 100%
rename from shaders/gpgpu/gpgpu_fill_gen8.asm
rename to lib/i915/shaders/gpgpu/gpgpu_fill_gen8.asm
diff --git a/shaders/gpgpu/gpgpu_fill_gen9.asm b/lib/i915/shaders/gpgpu/gpgpu_fill_gen9.asm
similarity index 100%
rename from shaders/gpgpu/gpgpu_fill_gen9.asm
rename to lib/i915/shaders/gpgpu/gpgpu_fill_gen9.asm
diff --git a/shaders/media/media_fill.gxa b/lib/i915/shaders/media/media_fill.gxa
similarity index 100%
rename from shaders/media/media_fill.gxa
rename to lib/i915/shaders/media/media_fill.gxa
diff --git a/shaders/media/media_fill_gen8.asm b/lib/i915/shaders/media/media_fill_gen8.asm
similarity index 100%
rename from shaders/media/media_fill_gen8.asm
rename to lib/i915/shaders/media/media_fill_gen8.asm
diff --git a/shaders/ps/blit.g7a b/lib/i915/shaders/ps/blit.g7a
similarity index 100%
rename from shaders/ps/blit.g7a
rename to lib/i915/shaders/ps/blit.g7a
diff --git a/shaders/ps/blit_gen8.asm b/lib/i915/shaders/ps/blit_gen8.asm
similarity index 100%
rename from shaders/ps/blit_gen8.asm
rename to lib/i915/shaders/ps/blit_gen8.asm
diff --git a/shaders/ps/neg1_gen8.asm b/lib/i915/shaders/ps/neg1_gen8.asm
similarity index 100%
rename from shaders/ps/neg1_gen8.asm
rename to lib/i915/shaders/ps/neg1_gen8.asm
diff --git a/shaders/ps/neg1_test.g7a b/lib/i915/shaders/ps/neg1_test.g7a
similarity index 100%
rename from shaders/ps/neg1_test.g7a
rename to lib/i915/shaders/ps/neg1_test.g7a
diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
index 1319b9e4..beb7a9b3 100644
--- a/lib/rendercopy_gen8.c
+++ b/lib/rendercopy_gen8.c
@@ -48,7 +48,7 @@ struct {
 	uint32_t sf_clip_state;
 } viewport;
 
-/* see shaders/ps/blit.g7a */
+/* see lib/i915/shaders/ps/blit.g7a */
 static const uint32_t ps_kernel[][4] = {
 #if 1
    { 0x0080005a, 0x2f403ae8, 0x3a0000c0, 0x008d0040 },
diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
index 0ed89776..f324fbd7 100644
--- a/lib/rendercopy_gen9.c
+++ b/lib/rendercopy_gen9.c
@@ -49,7 +49,7 @@ struct {
 	uint32_t sf_clip_state;
 } viewport;
 
-/* see shaders/ps/blit.g7a */
+/* see lib/i915/shaders/ps/blit.g7a */
 static const uint32_t ps_kernel[][4] = {
 #if 1
    { 0x0080005a, 0x2f403ae8, 0x3a0000c0, 0x008d0040 },
-- 
2.17.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev