From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Thu, 8 Sep 2011 08:35:15 +0000 (+0800)
Subject: move all post processing shader for GEN5/GEN6 to a directory
X-Git-Tag: 1.0_branch~214
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3b59b060b647d88dba102f1d600ff90d1e89796;p=profile%2Fivi%2Fvaapi-intel-driver.git

move all post processing shader for GEN5/GEN6 to a directory

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
---

diff --git a/configure.ac b/configure.ac
index 907b137..a171d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,7 @@ AC_OUTPUT([
     src/shaders/mpeg2/Makefile
     src/shaders/mpeg2/vld/Makefile
     src/shaders/post_processing/Makefile
+    src/shaders/post_processing/gen5_6/Makefile
     src/shaders/render/Makefile
     src/shaders/vme/Makefile
 ])
diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index 97ceb25..327f337 100644
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -46,35 +46,35 @@
                      IS_GEN7((ctx)->intel.device_id))
 
 static const uint32_t pp_null_gen5[][4] = {
-#include "shaders/post_processing/null.g4b.gen5"
+#include "shaders/post_processing/gen5_6/null.g4b.gen5"
 };
 
 static const uint32_t pp_nv12_load_save_nv12_gen5[][4] = {
-#include "shaders/post_processing/nv12_load_save_nv12.g4b.gen5"
+#include "shaders/post_processing/gen5_6/nv12_load_save_nv12.g4b.gen5"
 };
 
 static const uint32_t pp_nv12_load_save_pl3_gen5[][4] = {
-#include "shaders/post_processing/nv12_load_save_pl3.g4b.gen5"
+#include "shaders/post_processing/gen5_6/nv12_load_save_pl3.g4b.gen5"
 };
 
 static const uint32_t pp_pl3_load_save_nv12_gen5[][4] = {
-#include "shaders/post_processing/pl3_load_save_nv12.g4b.gen5"
+#include "shaders/post_processing/gen5_6/pl3_load_save_nv12.g4b.gen5"
 };
 
 static const uint32_t pp_pl3_load_save_pl3_gen5[][4] = {
-#include "shaders/post_processing/pl3_load_save_pl3.g4b.gen5"
+#include "shaders/post_processing/gen5_6/pl3_load_save_pl3.g4b.gen5"
 };
 
 static const uint32_t pp_nv12_scaling_gen5[][4] = {
-#include "shaders/post_processing/nv12_scaling_nv12.g4b.gen5"
+#include "shaders/post_processing/gen5_6/nv12_scaling_nv12.g4b.gen5"
 };
 
 static const uint32_t pp_nv12_avs_gen5[][4] = {
-#include "shaders/post_processing/nv12_avs_nv12.g4b.gen5"
+#include "shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5"
 };
 
 static const uint32_t pp_nv12_dndi_gen5[][4] = {
-#include "shaders/post_processing/nv12_dndi_nv12.g4b.gen5"
+#include "shaders/post_processing/gen5_6/nv12_dndi_nv12.g4b.gen5"
 };
 
 static void pp_null_initialize(VADriverContextP ctx, struct i965_post_processing_context *pp_context,
@@ -207,35 +207,35 @@ static struct pp_module pp_modules_gen5[] = {
 };
 
 static const uint32_t pp_null_gen6[][4] = {
-#include "shaders/post_processing/null.g6b"
+#include "shaders/post_processing/gen5_6/null.g6b"
 };
 
 static const uint32_t pp_nv12_load_save_nv12_gen6[][4] = {
-#include "shaders/post_processing/nv12_load_save_nv12.g6b"
+#include "shaders/post_processing/gen5_6/nv12_load_save_nv12.g6b"
 };
 
 static const uint32_t pp_nv12_load_save_pl3_gen6[][4] = {
-#include "shaders/post_processing/nv12_load_save_pl3.g6b"
+#include "shaders/post_processing/gen5_6/nv12_load_save_pl3.g6b"
 };
 
 static const uint32_t pp_pl3_load_save_nv12_gen6[][4] = {
-#include "shaders/post_processing/pl3_load_save_nv12.g6b"
+#include "shaders/post_processing/gen5_6/pl3_load_save_nv12.g6b"
 };
 
 static const uint32_t pp_pl3_load_save_pl3_gen6[][4] = {
-#include "shaders/post_processing/pl3_load_save_pl3.g6b"
+#include "shaders/post_processing/gen5_6/pl3_load_save_pl3.g6b"
 };
 
 static const uint32_t pp_nv12_scaling_gen6[][4] = {
-#include "shaders/post_processing/nv12_scaling_nv12.g6b"
+#include "shaders/post_processing/gen5_6/nv12_scaling_nv12.g6b"
 };
 
 static const uint32_t pp_nv12_avs_gen6[][4] = {
-#include "shaders/post_processing/nv12_avs_nv12.g6b"
+#include "shaders/post_processing/gen5_6/nv12_avs_nv12.g6b"
 };
 
 static const uint32_t pp_nv12_dndi_gen6[][4] = {
-#include "shaders/post_processing/nv12_dndi_nv12.g6b"
+#include "shaders/post_processing/gen5_6/nv12_dndi_nv12.g6b"
 };
 
 static struct pp_module pp_modules_gen6[] = {
diff --git a/src/shaders/post_processing/Makefile.am b/src/shaders/post_processing/Makefile.am
index d1b951a..8b136a0 100644
--- a/src/shaders/post_processing/Makefile.am
+++ b/src/shaders/post_processing/Makefile.am
@@ -1,198 +1 @@
-
-INTEL_G4I = 
-
-INTEL_G4A	= null.g4a
-INTEL_G4B	= null.g4b
-INTEL_G4B_GEN5	= null.g4b.gen5
-INTEL_G6A	= null.g6a
-INTEL_G6B	= null.g6b
-
-INTEL_PP_G4B_GEN5 = \
-	nv12_avs_nv12.g4b.gen5			\
-	nv12_dndi_nv12.g4b.gen5			\
-	nv12_load_save_nv12.g4b.gen5		\
-	nv12_load_save_pl3.g4b.gen5		\
-	nv12_scaling_nv12.g4b.gen5		\
-	pl3_load_save_nv12.g4b.gen5		\
-	pl3_load_save_pl3.g4b.gen5		\
-	$(NULL)
-
-INTEL_PP_G6B = \
-	nv12_avs_nv12.g6b			\
-	nv12_dndi_nv12.g6b			\
-	nv12_load_save_nv12.g6b			\
-	nv12_load_save_pl3.g6b			\
-	nv12_scaling_nv12.g6b			\
-	pl3_load_save_nv12.g6b			\
-	pl3_load_save_pl3.g6b			\
-	$(NULL)
-
-INTEL_PP_ASM = \
-	nv12_avs_nv12.asm			\
-	nv12_dndi_nv12.asm			\
-	nv12_load_save_nv12.asm			\
-	nv12_load_save_pl3.asm			\
-	nv12_scaling_nv12.asm			\
-	pl3_load_save_nv12.asm			\
-	pl3_load_save_pl3.asm			\
-	$(NULL)
-
-INTEL_PP_ASM += \
-	Common/AYUV_Load_16x8.asm			\
-	Common/IMC3_Load_8x4.asm			\
-	Common/IMC3_Load_8x5.asm			\
-	Common/IMC3_Load_9x5.asm			\
-	Common/Init_All_Regs.asm			\
-	Common/Multiple_Loop.asm			\
-	Common/Multiple_Loop_Head.asm			\
-	Common/NV11_Load_4x8.asm			\
-	Common/NV11_Load_5x8.asm			\
-	Common/NV12_Load_8x4.asm			\
-	Common/NV12_Load_8x5.asm			\
-	Common/NV12_Load_9x5.asm			\
-	Common/P208_Load_8x8.asm			\
-	Common/P208_Load_9x8.asm			\
-	Common/PA_Load_8x8.asm				\
-	Common/PA_Load_9x8.asm				\
-	Common/PL16x8_PL8x4.asm				\
-	Common/PL16x8_PL8x8.asm				\
-	Common/PL4x8_Save_NV11.asm			\
-	Common/PL5x8_PL16x8.asm				\
-	Common/PL5x8_PL8x8.asm				\
-	Common/PL8x4_Save_IMC3.asm			\
-	Common/PL8x4_Save_NV12.asm			\
-	Common/PL8x5_PL8x8.asm				\
-	Common/PL8x8_PL8x4.asm				\
-	Common/PL8x8_Save_P208.asm			\
-	Common/PL8x8_Save_PA.asm			\
-	Common/PL9x5_PL16x8.asm				\
-	Common/PL9x8_PL16x8.asm				\
-	Common/RGB16x8_Save_RGB.asm			\
-	Common/RGB16x8_Save_RGB16.asm			\
-	Common/RGB16x8_Save_Y416.asm			\
-	Common/RGB_Pack.asm				\
-	Common/SetupVPKernel.asm			\
-	Common/readSampler16x1.asm			\
-	Core_Kernels/AVS_SetupFirstBlock.asm		\
-	Core_Kernels/AVS_SetupSecondBlock.asm		\
-	Core_Kernels/DI_Hist_Save.asm			\
-	Core_Kernels/DI_SAVE_PA.asm			\
-	Core_Kernels/DNDI_COMMAND.asm			\
-	Core_Kernels/DNDI_Hist_Save.asm			\
-	Core_Kernels/PA_AVS_IEF_16x8.asm		\
-	Core_Kernels/PA_AVS_IEF_8x4.asm			\
-	Core_Kernels/PA_AVS_IEF_8x8.asm			\
-	Core_Kernels/PA_AVS_IEF_Sample.asm		\
-	Core_Kernels/PA_AVS_IEF_Unpack_16x8.asm		\
-	Core_Kernels/PA_AVS_IEF_Unpack_8x4.asm		\
-	Core_Kernels/PA_AVS_IEF_Unpack_8x8.asm		\
-	Core_Kernels/PA_DNDI_ALG.asm			\
-	Core_Kernels/PA_DN_ALG.asm			\
-	Core_Kernels/PA_Scaling.asm			\
-	Core_Kernels/PL2_AVS_IEF_16x8.asm		\
-	Core_Kernels/PL2_AVS_IEF_8x4.asm		\
-	Core_Kernels/PL2_AVS_IEF_8x8.asm		\
-	Core_Kernels/PL2_AVS_IEF_Unpack_16x8.asm	\
-	Core_Kernels/PL2_AVS_IEF_Unpack_8x4.asm		\
-	Core_Kernels/PL2_AVS_IEF_Unpack_8x8.asm		\
-	Core_Kernels/PL2_Scaling.asm			\
-	Core_Kernels/PL3_AVS_IEF_16x8.asm		\
-	Core_Kernels/PL3_AVS_IEF_8x4.asm		\
-	Core_Kernels/PL3_AVS_IEF_8x8.asm		\
-	Core_Kernels/PL3_AVS_IEF_Unpack_16x8.asm	\
-	Core_Kernels/PL3_AVS_IEF_Unpack_8x4.asm		\
-	Core_Kernels/PL3_AVS_IEF_Unpack_8x8.asm		\
-	Core_Kernels/PL3_Scaling.asm			\
-	Core_Kernels/PL_DNDI_ALG.asm			\
-	Core_Kernels/PL_DNDI_ALG_UVCopy_NV11.asm	\
-	Core_Kernels/PL_DNDI_ALG_UVCopy_NV12.asm	\
-	Core_Kernels/PL_DNDI_ALG_UVCopy_P208.asm	\
-	Core_Kernels/PL_DNDI_ALG_UVCopy_PL3.asm		\
-	Core_Kernels/PL_DN_ALG.asm			\
-	Core_Kernels/RGB_AVS_IEF_16x8.asm		\
-	Core_Kernels/RGB_AVS_IEF_Unpack_16x8.asm	\
-	Core_Kernels/RGB_AVS_IEF_Unscramble_16x8.asm	\
-	Core_Kernels/RGB_Scaling.asm			\
-	$(NULL)
-
-INTEL_PP_INC = \
-	Common/AYUV_Load_16x8.inc		\
-	Common/Expansion.inc			\
-	Common/PA_Load.inc			\
-	Common/PL2_Load.inc			\
-	Common/PL3_Load.inc			\
-	Common/PL4x8_Save_NV11.inc		\
-	Common/PL8x4_Save_IMC3.inc		\
-	Common/PL8x4_Save_NV12.inc		\
-	Common/PL8x8_PL8x4.inc			\
-	Common/PL8x8_Save_P208.inc		\
-	Common/PL8x8_Save_PA.inc		\
-	Common/RGB16x8_Save_RGB.inc		\
-	Common/RGB16x8_Save_RGB16.inc		\
-	Common/RGB16x8_Save_Y416.inc		\
-	Common/common.inc			\
-	Common/undefall.inc			\
-	Core_Kernels/AVS_IEF.inc		\
-	Core_Kernels/DI.inc			\
-	Core_Kernels/DNDI.inc			\
-	Core_Kernels/Scaling.inc
-	$(NULL)
-
-INTEL_PP_GEN5_ASM = $(INTEL_PP_G4B_GEN5:%.g4b.gen5=%.g5s)
-INTEL_PP_GEN6_ASM = $(INTEL_PP_G6B:%.g6b=%.g6s)
-
-TARGETS  =
-if HAVE_GEN4ASM
-TARGETS += $(INTEL_PP_G4B_GEN5)
-TARGETS += $(INTEL_PP_G6B)
-endif
-
-all-local: $(TARGETS)
-
-SUFFIXES = .g4a .g4b .g6a .g6b .g5s .g6s .asm
-
-.g4a.g4b:
-	m4 $*.g4a > $*.g4m			&& \
-	intel-gen4asm -o $@ $*.g4m		&& \
-	intel-gen4asm -g 5 -o $@.gen5 $*.g4m	&& \
-	rm $*.g4m
-
-.g6a.g6b:
-	m4 $< > $*.g6m				&& \
-	intel-gen4asm -g 6 -o $@ $*.g6m		&& \
-	rm $*.g6m
-
-$(INTEL_G4B): $(INTEL_G4I)
-
-$(INTEL_PP_GEN5_ASM): $(INTEL_PP_ASM)
-.asm.g5s:
-	cpp -D DEV_ILK -I Common/ -I Core_Kernels $< > _pp0.$@; \
-	../gpp.py _pp0.$@ $@; \
-	rm _pp0.$@
-.g5s.g4b.gen5:
-	intel-gen4asm -a -o $@ -g 5 $<
-
-$(INTEL_PP_GEN6_ASM): $(INTEL_PP_ASM)
-.asm.g6s:
-	cpp -D GT -I Common/ -I Core_Kernels $< > _pp0.$@; \
-	../gpp.py _pp0.$@ $@; \
-	rm _pp0.$@
-.g6s.g6b:
-	intel-gen4asm -a -o $@ -g 6 $<
-
-CLEANFILES = $(INTEL_PP_GEN5_ASM) $(INTEL_PP_GEN6_ASM)
-
-EXTRA_DIST = \
-	$(INTEL_G4A)		\
-	$(INTEL_G4B)		\
-	$(INTEL_G4B_GEN5)	\
-	$(INTEL_G4I)		\
-	$(INTEL_G6B)		\
-	$(INTEL_PP_ASM)		\
-	$(INTEL_PP_G4B_GEN5)	\
-	$(INTEL_PP_G6B)		\
-	$(INTEL_PP_INC)		\
-	$(NULL)
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = gen5_6
diff --git a/src/shaders/post_processing/Common/AYUV_Load_16x8.asm b/src/shaders/post_processing/gen5_6/Common/AYUV_Load_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/AYUV_Load_16x8.asm
rename to src/shaders/post_processing/gen5_6/Common/AYUV_Load_16x8.asm
diff --git a/src/shaders/post_processing/Common/AYUV_Load_16x8.inc b/src/shaders/post_processing/gen5_6/Common/AYUV_Load_16x8.inc
similarity index 100%
rename from src/shaders/post_processing/Common/AYUV_Load_16x8.inc
rename to src/shaders/post_processing/gen5_6/Common/AYUV_Load_16x8.inc
diff --git a/src/shaders/post_processing/Common/Expansion.inc b/src/shaders/post_processing/gen5_6/Common/Expansion.inc
similarity index 100%
rename from src/shaders/post_processing/Common/Expansion.inc
rename to src/shaders/post_processing/gen5_6/Common/Expansion.inc
diff --git a/src/shaders/post_processing/Common/IMC3_Load_8x4.asm b/src/shaders/post_processing/gen5_6/Common/IMC3_Load_8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Common/IMC3_Load_8x4.asm
rename to src/shaders/post_processing/gen5_6/Common/IMC3_Load_8x4.asm
diff --git a/src/shaders/post_processing/Common/IMC3_Load_8x5.asm b/src/shaders/post_processing/gen5_6/Common/IMC3_Load_8x5.asm
similarity index 100%
rename from src/shaders/post_processing/Common/IMC3_Load_8x5.asm
rename to src/shaders/post_processing/gen5_6/Common/IMC3_Load_8x5.asm
diff --git a/src/shaders/post_processing/Common/IMC3_Load_9x5.asm b/src/shaders/post_processing/gen5_6/Common/IMC3_Load_9x5.asm
similarity index 100%
rename from src/shaders/post_processing/Common/IMC3_Load_9x5.asm
rename to src/shaders/post_processing/gen5_6/Common/IMC3_Load_9x5.asm
diff --git a/src/shaders/post_processing/Common/Init_All_Regs.asm b/src/shaders/post_processing/gen5_6/Common/Init_All_Regs.asm
similarity index 100%
rename from src/shaders/post_processing/Common/Init_All_Regs.asm
rename to src/shaders/post_processing/gen5_6/Common/Init_All_Regs.asm
diff --git a/src/shaders/post_processing/Common/Multiple_Loop.asm b/src/shaders/post_processing/gen5_6/Common/Multiple_Loop.asm
similarity index 100%
rename from src/shaders/post_processing/Common/Multiple_Loop.asm
rename to src/shaders/post_processing/gen5_6/Common/Multiple_Loop.asm
diff --git a/src/shaders/post_processing/Common/Multiple_Loop_Head.asm b/src/shaders/post_processing/gen5_6/Common/Multiple_Loop_Head.asm
similarity index 100%
rename from src/shaders/post_processing/Common/Multiple_Loop_Head.asm
rename to src/shaders/post_processing/gen5_6/Common/Multiple_Loop_Head.asm
diff --git a/src/shaders/post_processing/Common/NV11_Load_4x8.asm b/src/shaders/post_processing/gen5_6/Common/NV11_Load_4x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/NV11_Load_4x8.asm
rename to src/shaders/post_processing/gen5_6/Common/NV11_Load_4x8.asm
diff --git a/src/shaders/post_processing/Common/NV11_Load_5x8.asm b/src/shaders/post_processing/gen5_6/Common/NV11_Load_5x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/NV11_Load_5x8.asm
rename to src/shaders/post_processing/gen5_6/Common/NV11_Load_5x8.asm
diff --git a/src/shaders/post_processing/Common/NV12_Load_8x4.asm b/src/shaders/post_processing/gen5_6/Common/NV12_Load_8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Common/NV12_Load_8x4.asm
rename to src/shaders/post_processing/gen5_6/Common/NV12_Load_8x4.asm
diff --git a/src/shaders/post_processing/Common/NV12_Load_8x5.asm b/src/shaders/post_processing/gen5_6/Common/NV12_Load_8x5.asm
similarity index 100%
rename from src/shaders/post_processing/Common/NV12_Load_8x5.asm
rename to src/shaders/post_processing/gen5_6/Common/NV12_Load_8x5.asm
diff --git a/src/shaders/post_processing/Common/NV12_Load_9x5.asm b/src/shaders/post_processing/gen5_6/Common/NV12_Load_9x5.asm
similarity index 100%
rename from src/shaders/post_processing/Common/NV12_Load_9x5.asm
rename to src/shaders/post_processing/gen5_6/Common/NV12_Load_9x5.asm
diff --git a/src/shaders/post_processing/Common/P208_Load_8x8.asm b/src/shaders/post_processing/gen5_6/Common/P208_Load_8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/P208_Load_8x8.asm
rename to src/shaders/post_processing/gen5_6/Common/P208_Load_8x8.asm
diff --git a/src/shaders/post_processing/Common/P208_Load_9x8.asm b/src/shaders/post_processing/gen5_6/Common/P208_Load_9x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/P208_Load_9x8.asm
rename to src/shaders/post_processing/gen5_6/Common/P208_Load_9x8.asm
diff --git a/src/shaders/post_processing/Common/PA_Load.inc b/src/shaders/post_processing/gen5_6/Common/PA_Load.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PA_Load.inc
rename to src/shaders/post_processing/gen5_6/Common/PA_Load.inc
diff --git a/src/shaders/post_processing/Common/PA_Load_8x8.asm b/src/shaders/post_processing/gen5_6/Common/PA_Load_8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PA_Load_8x8.asm
rename to src/shaders/post_processing/gen5_6/Common/PA_Load_8x8.asm
diff --git a/src/shaders/post_processing/Common/PA_Load_9x8.asm b/src/shaders/post_processing/gen5_6/Common/PA_Load_9x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PA_Load_9x8.asm
rename to src/shaders/post_processing/gen5_6/Common/PA_Load_9x8.asm
diff --git a/src/shaders/post_processing/Common/PL16x8_PL8x4.asm b/src/shaders/post_processing/gen5_6/Common/PL16x8_PL8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL16x8_PL8x4.asm
rename to src/shaders/post_processing/gen5_6/Common/PL16x8_PL8x4.asm
diff --git a/src/shaders/post_processing/Common/PL16x8_PL8x8.asm b/src/shaders/post_processing/gen5_6/Common/PL16x8_PL8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL16x8_PL8x8.asm
rename to src/shaders/post_processing/gen5_6/Common/PL16x8_PL8x8.asm
diff --git a/src/shaders/post_processing/Common/PL2_Load.inc b/src/shaders/post_processing/gen5_6/Common/PL2_Load.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PL2_Load.inc
rename to src/shaders/post_processing/gen5_6/Common/PL2_Load.inc
diff --git a/src/shaders/post_processing/Common/PL3_Load.inc b/src/shaders/post_processing/gen5_6/Common/PL3_Load.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PL3_Load.inc
rename to src/shaders/post_processing/gen5_6/Common/PL3_Load.inc
diff --git a/src/shaders/post_processing/Common/PL4x8_Save_NV11.asm b/src/shaders/post_processing/gen5_6/Common/PL4x8_Save_NV11.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL4x8_Save_NV11.asm
rename to src/shaders/post_processing/gen5_6/Common/PL4x8_Save_NV11.asm
diff --git a/src/shaders/post_processing/Common/PL4x8_Save_NV11.inc b/src/shaders/post_processing/gen5_6/Common/PL4x8_Save_NV11.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PL4x8_Save_NV11.inc
rename to src/shaders/post_processing/gen5_6/Common/PL4x8_Save_NV11.inc
diff --git a/src/shaders/post_processing/Common/PL5x8_PL16x8.asm b/src/shaders/post_processing/gen5_6/Common/PL5x8_PL16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL5x8_PL16x8.asm
rename to src/shaders/post_processing/gen5_6/Common/PL5x8_PL16x8.asm
diff --git a/src/shaders/post_processing/Common/PL5x8_PL8x8.asm b/src/shaders/post_processing/gen5_6/Common/PL5x8_PL8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL5x8_PL8x8.asm
rename to src/shaders/post_processing/gen5_6/Common/PL5x8_PL8x8.asm
diff --git a/src/shaders/post_processing/Common/PL8x4_Save_IMC3.asm b/src/shaders/post_processing/gen5_6/Common/PL8x4_Save_IMC3.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x4_Save_IMC3.asm
rename to src/shaders/post_processing/gen5_6/Common/PL8x4_Save_IMC3.asm
diff --git a/src/shaders/post_processing/Common/PL8x4_Save_IMC3.inc b/src/shaders/post_processing/gen5_6/Common/PL8x4_Save_IMC3.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x4_Save_IMC3.inc
rename to src/shaders/post_processing/gen5_6/Common/PL8x4_Save_IMC3.inc
diff --git a/src/shaders/post_processing/Common/PL8x4_Save_NV12.asm b/src/shaders/post_processing/gen5_6/Common/PL8x4_Save_NV12.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x4_Save_NV12.asm
rename to src/shaders/post_processing/gen5_6/Common/PL8x4_Save_NV12.asm
diff --git a/src/shaders/post_processing/Common/PL8x4_Save_NV12.inc b/src/shaders/post_processing/gen5_6/Common/PL8x4_Save_NV12.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x4_Save_NV12.inc
rename to src/shaders/post_processing/gen5_6/Common/PL8x4_Save_NV12.inc
diff --git a/src/shaders/post_processing/Common/PL8x5_PL8x8.asm b/src/shaders/post_processing/gen5_6/Common/PL8x5_PL8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x5_PL8x8.asm
rename to src/shaders/post_processing/gen5_6/Common/PL8x5_PL8x8.asm
diff --git a/src/shaders/post_processing/Common/PL8x8_PL8x4.asm b/src/shaders/post_processing/gen5_6/Common/PL8x8_PL8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x8_PL8x4.asm
rename to src/shaders/post_processing/gen5_6/Common/PL8x8_PL8x4.asm
diff --git a/src/shaders/post_processing/Common/PL8x8_PL8x4.inc b/src/shaders/post_processing/gen5_6/Common/PL8x8_PL8x4.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x8_PL8x4.inc
rename to src/shaders/post_processing/gen5_6/Common/PL8x8_PL8x4.inc
diff --git a/src/shaders/post_processing/Common/PL8x8_Save_P208.asm b/src/shaders/post_processing/gen5_6/Common/PL8x8_Save_P208.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x8_Save_P208.asm
rename to src/shaders/post_processing/gen5_6/Common/PL8x8_Save_P208.asm
diff --git a/src/shaders/post_processing/Common/PL8x8_Save_P208.inc b/src/shaders/post_processing/gen5_6/Common/PL8x8_Save_P208.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x8_Save_P208.inc
rename to src/shaders/post_processing/gen5_6/Common/PL8x8_Save_P208.inc
diff --git a/src/shaders/post_processing/Common/PL8x8_Save_PA.asm b/src/shaders/post_processing/gen5_6/Common/PL8x8_Save_PA.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x8_Save_PA.asm
rename to src/shaders/post_processing/gen5_6/Common/PL8x8_Save_PA.asm
diff --git a/src/shaders/post_processing/Common/PL8x8_Save_PA.inc b/src/shaders/post_processing/gen5_6/Common/PL8x8_Save_PA.inc
similarity index 100%
rename from src/shaders/post_processing/Common/PL8x8_Save_PA.inc
rename to src/shaders/post_processing/gen5_6/Common/PL8x8_Save_PA.inc
diff --git a/src/shaders/post_processing/Common/PL9x5_PL16x8.asm b/src/shaders/post_processing/gen5_6/Common/PL9x5_PL16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL9x5_PL16x8.asm
rename to src/shaders/post_processing/gen5_6/Common/PL9x5_PL16x8.asm
diff --git a/src/shaders/post_processing/Common/PL9x8_PL16x8.asm b/src/shaders/post_processing/gen5_6/Common/PL9x8_PL16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Common/PL9x8_PL16x8.asm
rename to src/shaders/post_processing/gen5_6/Common/PL9x8_PL16x8.asm
diff --git a/src/shaders/post_processing/Common/RGB16x8_Save_RGB.asm b/src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_RGB.asm
similarity index 100%
rename from src/shaders/post_processing/Common/RGB16x8_Save_RGB.asm
rename to src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_RGB.asm
diff --git a/src/shaders/post_processing/Common/RGB16x8_Save_RGB.inc b/src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_RGB.inc
similarity index 100%
rename from src/shaders/post_processing/Common/RGB16x8_Save_RGB.inc
rename to src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_RGB.inc
diff --git a/src/shaders/post_processing/Common/RGB16x8_Save_RGB16.asm b/src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_RGB16.asm
similarity index 100%
rename from src/shaders/post_processing/Common/RGB16x8_Save_RGB16.asm
rename to src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_RGB16.asm
diff --git a/src/shaders/post_processing/Common/RGB16x8_Save_RGB16.inc b/src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_RGB16.inc
similarity index 100%
rename from src/shaders/post_processing/Common/RGB16x8_Save_RGB16.inc
rename to src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_RGB16.inc
diff --git a/src/shaders/post_processing/Common/RGB16x8_Save_Y416.asm b/src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_Y416.asm
similarity index 100%
rename from src/shaders/post_processing/Common/RGB16x8_Save_Y416.asm
rename to src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_Y416.asm
diff --git a/src/shaders/post_processing/Common/RGB16x8_Save_Y416.inc b/src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_Y416.inc
similarity index 100%
rename from src/shaders/post_processing/Common/RGB16x8_Save_Y416.inc
rename to src/shaders/post_processing/gen5_6/Common/RGB16x8_Save_Y416.inc
diff --git a/src/shaders/post_processing/Common/RGB_Pack.asm b/src/shaders/post_processing/gen5_6/Common/RGB_Pack.asm
similarity index 100%
rename from src/shaders/post_processing/Common/RGB_Pack.asm
rename to src/shaders/post_processing/gen5_6/Common/RGB_Pack.asm
diff --git a/src/shaders/post_processing/Common/SetupVPKernel.asm b/src/shaders/post_processing/gen5_6/Common/SetupVPKernel.asm
similarity index 100%
rename from src/shaders/post_processing/Common/SetupVPKernel.asm
rename to src/shaders/post_processing/gen5_6/Common/SetupVPKernel.asm
diff --git a/src/shaders/post_processing/Common/common.inc b/src/shaders/post_processing/gen5_6/Common/common.inc
similarity index 100%
rename from src/shaders/post_processing/Common/common.inc
rename to src/shaders/post_processing/gen5_6/Common/common.inc
diff --git a/src/shaders/post_processing/Common/readSampler16x1.asm b/src/shaders/post_processing/gen5_6/Common/readSampler16x1.asm
similarity index 100%
rename from src/shaders/post_processing/Common/readSampler16x1.asm
rename to src/shaders/post_processing/gen5_6/Common/readSampler16x1.asm
diff --git a/src/shaders/post_processing/Common/undefall.inc b/src/shaders/post_processing/gen5_6/Common/undefall.inc
similarity index 100%
rename from src/shaders/post_processing/Common/undefall.inc
rename to src/shaders/post_processing/gen5_6/Common/undefall.inc
diff --git a/src/shaders/post_processing/Core_Kernels/AVS_IEF.inc b/src/shaders/post_processing/gen5_6/Core_Kernels/AVS_IEF.inc
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/AVS_IEF.inc
rename to src/shaders/post_processing/gen5_6/Core_Kernels/AVS_IEF.inc
diff --git a/src/shaders/post_processing/Core_Kernels/AVS_SetupFirstBlock.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/AVS_SetupFirstBlock.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/AVS_SetupFirstBlock.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/AVS_SetupFirstBlock.asm
diff --git a/src/shaders/post_processing/Core_Kernels/AVS_SetupSecondBlock.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/AVS_SetupSecondBlock.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/AVS_SetupSecondBlock.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/AVS_SetupSecondBlock.asm
diff --git a/src/shaders/post_processing/Core_Kernels/DI.inc b/src/shaders/post_processing/gen5_6/Core_Kernels/DI.inc
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/DI.inc
rename to src/shaders/post_processing/gen5_6/Core_Kernels/DI.inc
diff --git a/src/shaders/post_processing/Core_Kernels/DI_Hist_Save.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/DI_Hist_Save.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/DI_Hist_Save.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/DI_Hist_Save.asm
diff --git a/src/shaders/post_processing/Core_Kernels/DI_SAVE_PA.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/DI_SAVE_PA.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/DI_SAVE_PA.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/DI_SAVE_PA.asm
diff --git a/src/shaders/post_processing/Core_Kernels/DNDI.inc b/src/shaders/post_processing/gen5_6/Core_Kernels/DNDI.inc
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/DNDI.inc
rename to src/shaders/post_processing/gen5_6/Core_Kernels/DNDI.inc
diff --git a/src/shaders/post_processing/Core_Kernels/DNDI_COMMAND.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/DNDI_COMMAND.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/DNDI_COMMAND.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/DNDI_COMMAND.asm
diff --git a/src/shaders/post_processing/Core_Kernels/DNDI_Hist_Save.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/DNDI_Hist_Save.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/DNDI_Hist_Save.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/DNDI_Hist_Save.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_8x4.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_8x4.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_8x4.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_8x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_8x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_8x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_Sample.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_Sample.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_Sample.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_Sample.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_Unpack_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_Unpack_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_Unpack_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_Unpack_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_Unpack_8x4.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_Unpack_8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_Unpack_8x4.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_Unpack_8x4.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_Unpack_8x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_Unpack_8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_AVS_IEF_Unpack_8x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_AVS_IEF_Unpack_8x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_DNDI_ALG.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_DNDI_ALG.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_DNDI_ALG.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_DNDI_ALG.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_DN_ALG.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_DN_ALG.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_DN_ALG.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_DN_ALG.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PA_Scaling.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PA_Scaling.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PA_Scaling.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PA_Scaling.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_8x4.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_8x4.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_8x4.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_8x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_8x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_8x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_Unpack_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_Unpack_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_Unpack_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_Unpack_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_Unpack_8x4.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_Unpack_8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_Unpack_8x4.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_Unpack_8x4.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_Unpack_8x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_Unpack_8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL2_AVS_IEF_Unpack_8x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL2_AVS_IEF_Unpack_8x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL2_Scaling.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL2_Scaling.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL2_Scaling.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL2_Scaling.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_8x4.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_8x4.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_8x4.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_8x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_8x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_8x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_Unpack_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_Unpack_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_Unpack_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_Unpack_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_Unpack_8x4.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_Unpack_8x4.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_Unpack_8x4.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_Unpack_8x4.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_Unpack_8x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_Unpack_8x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL3_AVS_IEF_Unpack_8x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL3_AVS_IEF_Unpack_8x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL3_Scaling.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL3_Scaling.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL3_Scaling.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL3_Scaling.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG_UVCopy_NV11.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG_UVCopy_NV11.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG_UVCopy_NV11.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG_UVCopy_NV11.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG_UVCopy_NV12.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG_UVCopy_NV12.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG_UVCopy_NV12.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG_UVCopy_NV12.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG_UVCopy_P208.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG_UVCopy_P208.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG_UVCopy_P208.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG_UVCopy_P208.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG_UVCopy_PL3.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG_UVCopy_PL3.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL_DNDI_ALG_UVCopy_PL3.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL_DNDI_ALG_UVCopy_PL3.asm
diff --git a/src/shaders/post_processing/Core_Kernels/PL_DN_ALG.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/PL_DN_ALG.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/PL_DN_ALG.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/PL_DN_ALG.asm
diff --git a/src/shaders/post_processing/Core_Kernels/RGB_AVS_IEF_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/RGB_AVS_IEF_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/RGB_AVS_IEF_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/RGB_AVS_IEF_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/RGB_AVS_IEF_Unpack_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/RGB_AVS_IEF_Unpack_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/RGB_AVS_IEF_Unpack_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/RGB_AVS_IEF_Unpack_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/RGB_AVS_IEF_Unscramble_16x8.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/RGB_AVS_IEF_Unscramble_16x8.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/RGB_AVS_IEF_Unscramble_16x8.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/RGB_AVS_IEF_Unscramble_16x8.asm
diff --git a/src/shaders/post_processing/Core_Kernels/RGB_Scaling.asm b/src/shaders/post_processing/gen5_6/Core_Kernels/RGB_Scaling.asm
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/RGB_Scaling.asm
rename to src/shaders/post_processing/gen5_6/Core_Kernels/RGB_Scaling.asm
diff --git a/src/shaders/post_processing/Core_Kernels/Scaling.inc b/src/shaders/post_processing/gen5_6/Core_Kernels/Scaling.inc
similarity index 100%
rename from src/shaders/post_processing/Core_Kernels/Scaling.inc
rename to src/shaders/post_processing/gen5_6/Core_Kernels/Scaling.inc
diff --git a/src/shaders/post_processing/gen5_6/Makefile.am b/src/shaders/post_processing/gen5_6/Makefile.am
new file mode 100644
index 0000000..23b12ef
--- /dev/null
+++ b/src/shaders/post_processing/gen5_6/Makefile.am
@@ -0,0 +1,198 @@
+
+INTEL_G4I = 
+
+INTEL_G4A	= null.g4a
+INTEL_G4B	= null.g4b
+INTEL_G4B_GEN5	= null.g4b.gen5
+INTEL_G6A	= null.g6a
+INTEL_G6B	= null.g6b
+
+INTEL_PP_G4B_GEN5 = \
+	nv12_avs_nv12.g4b.gen5			\
+	nv12_dndi_nv12.g4b.gen5			\
+	nv12_load_save_nv12.g4b.gen5		\
+	nv12_load_save_pl3.g4b.gen5		\
+	nv12_scaling_nv12.g4b.gen5		\
+	pl3_load_save_nv12.g4b.gen5		\
+	pl3_load_save_pl3.g4b.gen5		\
+	$(NULL)
+
+INTEL_PP_G6B = \
+	nv12_avs_nv12.g6b			\
+	nv12_dndi_nv12.g6b			\
+	nv12_load_save_nv12.g6b			\
+	nv12_load_save_pl3.g6b			\
+	nv12_scaling_nv12.g6b			\
+	pl3_load_save_nv12.g6b			\
+	pl3_load_save_pl3.g6b			\
+	$(NULL)
+
+INTEL_PP_ASM = \
+	nv12_avs_nv12.asm			\
+	nv12_dndi_nv12.asm			\
+	nv12_load_save_nv12.asm			\
+	nv12_load_save_pl3.asm			\
+	nv12_scaling_nv12.asm			\
+	pl3_load_save_nv12.asm			\
+	pl3_load_save_pl3.asm			\
+	$(NULL)
+
+INTEL_PP_ASM += \
+	Common/AYUV_Load_16x8.asm			\
+	Common/IMC3_Load_8x4.asm			\
+	Common/IMC3_Load_8x5.asm			\
+	Common/IMC3_Load_9x5.asm			\
+	Common/Init_All_Regs.asm			\
+	Common/Multiple_Loop.asm			\
+	Common/Multiple_Loop_Head.asm			\
+	Common/NV11_Load_4x8.asm			\
+	Common/NV11_Load_5x8.asm			\
+	Common/NV12_Load_8x4.asm			\
+	Common/NV12_Load_8x5.asm			\
+	Common/NV12_Load_9x5.asm			\
+	Common/P208_Load_8x8.asm			\
+	Common/P208_Load_9x8.asm			\
+	Common/PA_Load_8x8.asm				\
+	Common/PA_Load_9x8.asm				\
+	Common/PL16x8_PL8x4.asm				\
+	Common/PL16x8_PL8x8.asm				\
+	Common/PL4x8_Save_NV11.asm			\
+	Common/PL5x8_PL16x8.asm				\
+	Common/PL5x8_PL8x8.asm				\
+	Common/PL8x4_Save_IMC3.asm			\
+	Common/PL8x4_Save_NV12.asm			\
+	Common/PL8x5_PL8x8.asm				\
+	Common/PL8x8_PL8x4.asm				\
+	Common/PL8x8_Save_P208.asm			\
+	Common/PL8x8_Save_PA.asm			\
+	Common/PL9x5_PL16x8.asm				\
+	Common/PL9x8_PL16x8.asm				\
+	Common/RGB16x8_Save_RGB.asm			\
+	Common/RGB16x8_Save_RGB16.asm			\
+	Common/RGB16x8_Save_Y416.asm			\
+	Common/RGB_Pack.asm				\
+	Common/SetupVPKernel.asm			\
+	Common/readSampler16x1.asm			\
+	Core_Kernels/AVS_SetupFirstBlock.asm		\
+	Core_Kernels/AVS_SetupSecondBlock.asm		\
+	Core_Kernels/DI_Hist_Save.asm			\
+	Core_Kernels/DI_SAVE_PA.asm			\
+	Core_Kernels/DNDI_COMMAND.asm			\
+	Core_Kernels/DNDI_Hist_Save.asm			\
+	Core_Kernels/PA_AVS_IEF_16x8.asm		\
+	Core_Kernels/PA_AVS_IEF_8x4.asm			\
+	Core_Kernels/PA_AVS_IEF_8x8.asm			\
+	Core_Kernels/PA_AVS_IEF_Sample.asm		\
+	Core_Kernels/PA_AVS_IEF_Unpack_16x8.asm		\
+	Core_Kernels/PA_AVS_IEF_Unpack_8x4.asm		\
+	Core_Kernels/PA_AVS_IEF_Unpack_8x8.asm		\
+	Core_Kernels/PA_DNDI_ALG.asm			\
+	Core_Kernels/PA_DN_ALG.asm			\
+	Core_Kernels/PA_Scaling.asm			\
+	Core_Kernels/PL2_AVS_IEF_16x8.asm		\
+	Core_Kernels/PL2_AVS_IEF_8x4.asm		\
+	Core_Kernels/PL2_AVS_IEF_8x8.asm		\
+	Core_Kernels/PL2_AVS_IEF_Unpack_16x8.asm	\
+	Core_Kernels/PL2_AVS_IEF_Unpack_8x4.asm		\
+	Core_Kernels/PL2_AVS_IEF_Unpack_8x8.asm		\
+	Core_Kernels/PL2_Scaling.asm			\
+	Core_Kernels/PL3_AVS_IEF_16x8.asm		\
+	Core_Kernels/PL3_AVS_IEF_8x4.asm		\
+	Core_Kernels/PL3_AVS_IEF_8x8.asm		\
+	Core_Kernels/PL3_AVS_IEF_Unpack_16x8.asm	\
+	Core_Kernels/PL3_AVS_IEF_Unpack_8x4.asm		\
+	Core_Kernels/PL3_AVS_IEF_Unpack_8x8.asm		\
+	Core_Kernels/PL3_Scaling.asm			\
+	Core_Kernels/PL_DNDI_ALG.asm			\
+	Core_Kernels/PL_DNDI_ALG_UVCopy_NV11.asm	\
+	Core_Kernels/PL_DNDI_ALG_UVCopy_NV12.asm	\
+	Core_Kernels/PL_DNDI_ALG_UVCopy_P208.asm	\
+	Core_Kernels/PL_DNDI_ALG_UVCopy_PL3.asm		\
+	Core_Kernels/PL_DN_ALG.asm			\
+	Core_Kernels/RGB_AVS_IEF_16x8.asm		\
+	Core_Kernels/RGB_AVS_IEF_Unpack_16x8.asm	\
+	Core_Kernels/RGB_AVS_IEF_Unscramble_16x8.asm	\
+	Core_Kernels/RGB_Scaling.asm			\
+	$(NULL)
+
+INTEL_PP_INC = \
+	Common/AYUV_Load_16x8.inc		\
+	Common/Expansion.inc			\
+	Common/PA_Load.inc			\
+	Common/PL2_Load.inc			\
+	Common/PL3_Load.inc			\
+	Common/PL4x8_Save_NV11.inc		\
+	Common/PL8x4_Save_IMC3.inc		\
+	Common/PL8x4_Save_NV12.inc		\
+	Common/PL8x8_PL8x4.inc			\
+	Common/PL8x8_Save_P208.inc		\
+	Common/PL8x8_Save_PA.inc		\
+	Common/RGB16x8_Save_RGB.inc		\
+	Common/RGB16x8_Save_RGB16.inc		\
+	Common/RGB16x8_Save_Y416.inc		\
+	Common/common.inc			\
+	Common/undefall.inc			\
+	Core_Kernels/AVS_IEF.inc		\
+	Core_Kernels/DI.inc			\
+	Core_Kernels/DNDI.inc			\
+	Core_Kernels/Scaling.inc
+	$(NULL)
+
+INTEL_PP_GEN5_ASM = $(INTEL_PP_G4B_GEN5:%.g4b.gen5=%.g5s)
+INTEL_PP_GEN6_ASM = $(INTEL_PP_G6B:%.g6b=%.g6s)
+
+TARGETS  =
+if HAVE_GEN4ASM
+TARGETS += $(INTEL_PP_G4B_GEN5)
+TARGETS += $(INTEL_PP_G6B)
+endif
+
+all-local: $(TARGETS)
+
+SUFFIXES = .g4a .g4b .g6a .g6b .g5s .g6s .asm
+
+.g4a.g4b:
+	m4 $*.g4a > $*.g4m			&& \
+	intel-gen4asm -o $@ $*.g4m		&& \
+	intel-gen4asm -g 5 -o $@.gen5 $*.g4m	&& \
+	rm $*.g4m
+
+.g6a.g6b:
+	m4 $< > $*.g6m				&& \
+	intel-gen4asm -g 6 -o $@ $*.g6m		&& \
+	rm $*.g6m
+
+$(INTEL_G4B): $(INTEL_G4I)
+
+$(INTEL_PP_GEN5_ASM): $(INTEL_PP_ASM)
+.asm.g5s:
+	cpp -D DEV_ILK -I Common/ -I Core_Kernels $< > _pp0.$@; \
+	../../gpp.py _pp0.$@ $@; \
+	rm _pp0.$@
+.g5s.g4b.gen5:
+	intel-gen4asm -a -o $@ -g 5 $<
+
+$(INTEL_PP_GEN6_ASM): $(INTEL_PP_ASM)
+.asm.g6s:
+	cpp -D GT -I Common/ -I Core_Kernels $< > _pp0.$@; \
+	../../gpp.py _pp0.$@ $@; \
+	rm _pp0.$@
+.g6s.g6b:
+	intel-gen4asm -a -o $@ -g 6 $<
+
+CLEANFILES = $(INTEL_PP_GEN5_ASM) $(INTEL_PP_GEN6_ASM)
+
+EXTRA_DIST = \
+	$(INTEL_G4A)		\
+	$(INTEL_G4B)		\
+	$(INTEL_G4B_GEN5)	\
+	$(INTEL_G4I)		\
+	$(INTEL_G6B)		\
+	$(INTEL_PP_ASM)		\
+	$(INTEL_PP_G4B_GEN5)	\
+	$(INTEL_PP_G6B)		\
+	$(INTEL_PP_INC)		\
+	$(NULL)
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/shaders/post_processing/null.g4a b/src/shaders/post_processing/gen5_6/null.g4a
similarity index 100%
rename from src/shaders/post_processing/null.g4a
rename to src/shaders/post_processing/gen5_6/null.g4a
diff --git a/src/shaders/post_processing/null.g4b b/src/shaders/post_processing/gen5_6/null.g4b
similarity index 100%
rename from src/shaders/post_processing/null.g4b
rename to src/shaders/post_processing/gen5_6/null.g4b
diff --git a/src/shaders/post_processing/null.g4b.gen5 b/src/shaders/post_processing/gen5_6/null.g4b.gen5
similarity index 100%
rename from src/shaders/post_processing/null.g4b.gen5
rename to src/shaders/post_processing/gen5_6/null.g4b.gen5
diff --git a/src/shaders/post_processing/null.g6a b/src/shaders/post_processing/gen5_6/null.g6a
similarity index 100%
rename from src/shaders/post_processing/null.g6a
rename to src/shaders/post_processing/gen5_6/null.g6a
diff --git a/src/shaders/post_processing/null.g6b b/src/shaders/post_processing/gen5_6/null.g6b
similarity index 100%
rename from src/shaders/post_processing/null.g6b
rename to src/shaders/post_processing/gen5_6/null.g6b
diff --git a/src/shaders/post_processing/nv12_avs_nv12.asm b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.asm
similarity index 100%
rename from src/shaders/post_processing/nv12_avs_nv12.asm
rename to src/shaders/post_processing/gen5_6/nv12_avs_nv12.asm
diff --git a/src/shaders/post_processing/nv12_avs_nv12.g4b.gen5 b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5
similarity index 100%
rename from src/shaders/post_processing/nv12_avs_nv12.g4b.gen5
rename to src/shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5
diff --git a/src/shaders/post_processing/nv12_avs_nv12.g6b b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g6b
similarity index 100%
rename from src/shaders/post_processing/nv12_avs_nv12.g6b
rename to src/shaders/post_processing/gen5_6/nv12_avs_nv12.g6b
diff --git a/src/shaders/post_processing/nv12_dndi_nv12.asm b/src/shaders/post_processing/gen5_6/nv12_dndi_nv12.asm
similarity index 100%
rename from src/shaders/post_processing/nv12_dndi_nv12.asm
rename to src/shaders/post_processing/gen5_6/nv12_dndi_nv12.asm
diff --git a/src/shaders/post_processing/nv12_dndi_nv12.g4b.gen5 b/src/shaders/post_processing/gen5_6/nv12_dndi_nv12.g4b.gen5
similarity index 100%
rename from src/shaders/post_processing/nv12_dndi_nv12.g4b.gen5
rename to src/shaders/post_processing/gen5_6/nv12_dndi_nv12.g4b.gen5
diff --git a/src/shaders/post_processing/nv12_dndi_nv12.g6b b/src/shaders/post_processing/gen5_6/nv12_dndi_nv12.g6b
similarity index 100%
rename from src/shaders/post_processing/nv12_dndi_nv12.g6b
rename to src/shaders/post_processing/gen5_6/nv12_dndi_nv12.g6b
diff --git a/src/shaders/post_processing/nv12_load_save_nv12.asm b/src/shaders/post_processing/gen5_6/nv12_load_save_nv12.asm
similarity index 100%
rename from src/shaders/post_processing/nv12_load_save_nv12.asm
rename to src/shaders/post_processing/gen5_6/nv12_load_save_nv12.asm
diff --git a/src/shaders/post_processing/nv12_load_save_nv12.g4b.gen5 b/src/shaders/post_processing/gen5_6/nv12_load_save_nv12.g4b.gen5
similarity index 100%
rename from src/shaders/post_processing/nv12_load_save_nv12.g4b.gen5
rename to src/shaders/post_processing/gen5_6/nv12_load_save_nv12.g4b.gen5
diff --git a/src/shaders/post_processing/nv12_load_save_nv12.g6b b/src/shaders/post_processing/gen5_6/nv12_load_save_nv12.g6b
similarity index 100%
rename from src/shaders/post_processing/nv12_load_save_nv12.g6b
rename to src/shaders/post_processing/gen5_6/nv12_load_save_nv12.g6b
diff --git a/src/shaders/post_processing/nv12_load_save_pl3.asm b/src/shaders/post_processing/gen5_6/nv12_load_save_pl3.asm
similarity index 100%
rename from src/shaders/post_processing/nv12_load_save_pl3.asm
rename to src/shaders/post_processing/gen5_6/nv12_load_save_pl3.asm
diff --git a/src/shaders/post_processing/nv12_load_save_pl3.g4b.gen5 b/src/shaders/post_processing/gen5_6/nv12_load_save_pl3.g4b.gen5
similarity index 100%
rename from src/shaders/post_processing/nv12_load_save_pl3.g4b.gen5
rename to src/shaders/post_processing/gen5_6/nv12_load_save_pl3.g4b.gen5
diff --git a/src/shaders/post_processing/nv12_load_save_pl3.g6b b/src/shaders/post_processing/gen5_6/nv12_load_save_pl3.g6b
similarity index 100%
rename from src/shaders/post_processing/nv12_load_save_pl3.g6b
rename to src/shaders/post_processing/gen5_6/nv12_load_save_pl3.g6b
diff --git a/src/shaders/post_processing/nv12_scaling_nv12.asm b/src/shaders/post_processing/gen5_6/nv12_scaling_nv12.asm
similarity index 100%
rename from src/shaders/post_processing/nv12_scaling_nv12.asm
rename to src/shaders/post_processing/gen5_6/nv12_scaling_nv12.asm
diff --git a/src/shaders/post_processing/nv12_scaling_nv12.g4b.gen5 b/src/shaders/post_processing/gen5_6/nv12_scaling_nv12.g4b.gen5
similarity index 100%
rename from src/shaders/post_processing/nv12_scaling_nv12.g4b.gen5
rename to src/shaders/post_processing/gen5_6/nv12_scaling_nv12.g4b.gen5
diff --git a/src/shaders/post_processing/nv12_scaling_nv12.g6b b/src/shaders/post_processing/gen5_6/nv12_scaling_nv12.g6b
similarity index 100%
rename from src/shaders/post_processing/nv12_scaling_nv12.g6b
rename to src/shaders/post_processing/gen5_6/nv12_scaling_nv12.g6b
diff --git a/src/shaders/post_processing/pl3_load_save_nv12.asm b/src/shaders/post_processing/gen5_6/pl3_load_save_nv12.asm
similarity index 100%
rename from src/shaders/post_processing/pl3_load_save_nv12.asm
rename to src/shaders/post_processing/gen5_6/pl3_load_save_nv12.asm
diff --git a/src/shaders/post_processing/pl3_load_save_nv12.g4b.gen5 b/src/shaders/post_processing/gen5_6/pl3_load_save_nv12.g4b.gen5
similarity index 100%
rename from src/shaders/post_processing/pl3_load_save_nv12.g4b.gen5
rename to src/shaders/post_processing/gen5_6/pl3_load_save_nv12.g4b.gen5
diff --git a/src/shaders/post_processing/pl3_load_save_nv12.g6b b/src/shaders/post_processing/gen5_6/pl3_load_save_nv12.g6b
similarity index 100%
rename from src/shaders/post_processing/pl3_load_save_nv12.g6b
rename to src/shaders/post_processing/gen5_6/pl3_load_save_nv12.g6b
diff --git a/src/shaders/post_processing/pl3_load_save_pl3.asm b/src/shaders/post_processing/gen5_6/pl3_load_save_pl3.asm
similarity index 100%
rename from src/shaders/post_processing/pl3_load_save_pl3.asm
rename to src/shaders/post_processing/gen5_6/pl3_load_save_pl3.asm
diff --git a/src/shaders/post_processing/pl3_load_save_pl3.g4b.gen5 b/src/shaders/post_processing/gen5_6/pl3_load_save_pl3.g4b.gen5
similarity index 100%
rename from src/shaders/post_processing/pl3_load_save_pl3.g4b.gen5
rename to src/shaders/post_processing/gen5_6/pl3_load_save_pl3.g4b.gen5
diff --git a/src/shaders/post_processing/pl3_load_save_pl3.g6b b/src/shaders/post_processing/gen5_6/pl3_load_save_pl3.g6b
similarity index 100%
rename from src/shaders/post_processing/pl3_load_save_pl3.g6b
rename to src/shaders/post_processing/gen5_6/pl3_load_save_pl3.g6b