xvmc: move 965 mc media programs to shader/mc directory
Also include some missed g4i files in Makefile.am, fix shader build.
This commit is contained in:
Zhenyu Wang
parent
ebcb64fdc8
commit
91886f82a1
|
|
@ -272,6 +272,7 @@ AC_OUTPUT([
|
|||
src/Makefile
|
||||
src/xvmc/Makefile
|
||||
src/xvmc/shader/Makefile
|
||||
src/xvmc/shader/mc/Makefile
|
||||
src/xvmc/shader/vld/Makefile
|
||||
src/bios_reader/Makefile
|
||||
src/ch7017/Makefile
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la
|
|||
endif
|
||||
|
||||
SUBDIRS = shader
|
||||
|
||||
libI810XvMC_la_SOURCES = I810XvMC.c \
|
||||
I810XvMC.h
|
||||
|
||||
|
|
@ -32,98 +33,3 @@ libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
|
|||
@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
|
||||
libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
|
||||
libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ -lpthread
|
||||
|
||||
INTEL_G4A = \
|
||||
dual_prime_igd.g4a \
|
||||
field_backward_igd.g4a \
|
||||
field_f_b_igd.g4a \
|
||||
field_forward_igd.g4a \
|
||||
frame_backward_igd.g4a \
|
||||
frame_f_b_igd.g4a \
|
||||
frame_forward_igd.g4a \
|
||||
dual_prime.g4a \
|
||||
field_backward.g4a \
|
||||
field_f_b.g4a \
|
||||
field_forward.g4a \
|
||||
frame_backward.g4a \
|
||||
frame_f_b.g4a \
|
||||
frame_forward.g4a \
|
||||
ipicture.g4a \
|
||||
null.g4a
|
||||
|
||||
INTEL_G4I = \
|
||||
addidct.g4i \
|
||||
block_clear.g4i \
|
||||
read_frame_x0y0_y.g4i \
|
||||
read_frame_x0y1_y.g4i \
|
||||
read_frame_x1y0_y.g4i \
|
||||
read_frame_x1y1_y.g4i \
|
||||
read_frame_x0y0_uv.g4i \
|
||||
read_frame_x0y1_uv.g4i \
|
||||
read_frame_x1y0_uv.g4i \
|
||||
read_frame_x1y1_uv.g4i \
|
||||
read_frame_x0y0_y_igd.g4i \
|
||||
read_frame_x0y1_y_igd.g4i \
|
||||
read_frame_x1y0_y_igd.g4i \
|
||||
read_frame_x1y1_y_igd.g4i \
|
||||
read_frame_x0y0_uv_igd.g4i \
|
||||
read_frame_x0y1_uv_igd.g4i \
|
||||
read_frame_x1y0_uv_igd.g4i \
|
||||
read_frame_x1y1_uv_igd.g4i \
|
||||
motion_frame_y.g4i \
|
||||
motion_frame_uv.g4i \
|
||||
read_field_x0y0_y.g4i \
|
||||
read_field_x0y1_y.g4i \
|
||||
read_field_x1y0_y.g4i \
|
||||
read_field_x1y1_y.g4i \
|
||||
read_field_x0y0_uv.g4i \
|
||||
read_field_x0y1_uv.g4i \
|
||||
read_field_x1y0_uv.g4i \
|
||||
read_field_x1y1_uv.g4i \
|
||||
read_field_x0y0_y_igd.g4i \
|
||||
read_field_x0y1_y_igd.g4i \
|
||||
read_field_x1y0_y_igd.g4i \
|
||||
read_field_x1y1_y_igd.g4i \
|
||||
read_field_x0y0_uv_igd.g4i \
|
||||
read_field_x0y1_uv_igd.g4i \
|
||||
read_field_x1y0_uv_igd.g4i \
|
||||
read_field_x1y1_uv_igd.g4i \
|
||||
motion_field_y.g4i \
|
||||
motion_field_uv.g4i
|
||||
|
||||
INTEL_G4B = \
|
||||
dual_prime.g4b \
|
||||
field_backward.g4b \
|
||||
field_f_b.g4b \
|
||||
field_forward.g4b \
|
||||
frame_backward.g4b \
|
||||
frame_f_b.g4b \
|
||||
frame_forward.g4b \
|
||||
dual_prime_igd.g4b \
|
||||
field_backward_igd.g4b \
|
||||
field_f_b_igd.g4b \
|
||||
field_forward_igd.g4b \
|
||||
frame_backward_igd.g4b \
|
||||
frame_f_b_igd.g4b \
|
||||
frame_forward_igd.g4b \
|
||||
ipicture.g4b \
|
||||
null.g4b
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(INTEL_G4A) \
|
||||
$(INTEL_G4I) \
|
||||
$(INTEL_G4B)
|
||||
|
||||
if HAVE_GEN4ASM
|
||||
|
||||
SUFFIXES = .g4a .g4b
|
||||
.g4a.g4b:
|
||||
m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
|
||||
|
||||
$(INTEL_G4B): $(INTEL_G4I)
|
||||
|
||||
BUILT_SOURCES= $(INTEL_G4B)
|
||||
|
||||
clean-local:
|
||||
-rm -f $(INTEL_G4B)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -46,52 +46,52 @@ enum interface {
|
|||
};
|
||||
|
||||
static const uint32_t ipicture_kernel_static[][4] = {
|
||||
#include "ipicture.g4b"
|
||||
#include "shader/mc/ipicture.g4b"
|
||||
};
|
||||
static const uint32_t null_kernel_static[][4] = {
|
||||
#include "null.g4b"
|
||||
#include "shader/mc/null.g4b"
|
||||
};
|
||||
static const uint32_t frame_forward_kernel_static[][4] = {
|
||||
#include "frame_forward.g4b"
|
||||
#include "shader/mc/frame_forward.g4b"
|
||||
};
|
||||
static const uint32_t frame_backward_kernel_static[][4] = {
|
||||
#include "frame_backward.g4b"
|
||||
#include "shader/mc/frame_backward.g4b"
|
||||
};
|
||||
static const uint32_t frame_f_b_kernel_static[][4] = {
|
||||
#include "frame_f_b.g4b"
|
||||
#include "shader/mc/frame_f_b.g4b"
|
||||
};
|
||||
static const uint32_t field_forward_kernel_static[][4] = {
|
||||
#include "field_forward.g4b"
|
||||
#include "shader/mc/field_forward.g4b"
|
||||
};
|
||||
static const uint32_t field_backward_kernel_static[][4] = {
|
||||
#include "field_backward.g4b"
|
||||
#include "shader/mc/field_backward.g4b"
|
||||
};
|
||||
static const uint32_t field_f_b_kernel_static[][4] = {
|
||||
#include "field_f_b.g4b"
|
||||
#include "shader/mc/field_f_b.g4b"
|
||||
};
|
||||
static const uint32_t dual_prime_kernel_static[][4]= {
|
||||
#include "dual_prime.g4b"
|
||||
#include "shader/mc/dual_prime.g4b"
|
||||
};
|
||||
static const uint32_t frame_forward_igd_kernel_static[][4] = {
|
||||
#include "frame_forward_igd.g4b"
|
||||
#include "shader/mc/frame_forward_igd.g4b"
|
||||
};
|
||||
static const uint32_t frame_backward_igd_kernel_static[][4] = {
|
||||
#include "frame_backward_igd.g4b"
|
||||
#include "shader/mc/frame_backward_igd.g4b"
|
||||
};
|
||||
static const uint32_t frame_f_b_igd_kernel_static[][4] = {
|
||||
#include "frame_f_b_igd.g4b"
|
||||
#include "shader/mc/frame_f_b_igd.g4b"
|
||||
};
|
||||
static const uint32_t field_forward_igd_kernel_static[][4] = {
|
||||
#include "field_forward_igd.g4b"
|
||||
#include "shader/mc/field_forward_igd.g4b"
|
||||
};
|
||||
static const uint32_t field_backward_igd_kernel_static[][4] = {
|
||||
#include "field_backward_igd.g4b"
|
||||
#include "shader/mc/field_backward_igd.g4b"
|
||||
};
|
||||
static const uint32_t field_f_b_igd_kernel_static[][4] = {
|
||||
#include "field_f_b_igd.g4b"
|
||||
#include "shader/mc/field_f_b_igd.g4b"
|
||||
};
|
||||
static const uint32_t dual_prime_igd_kernel_static[][4]= {
|
||||
#include "dual_prime_igd.g4b"
|
||||
#include "shader/mc/dual_prime_igd.g4b"
|
||||
};
|
||||
|
||||
#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SUBDIRS = vld
|
||||
SUBDIRS = mc vld
|
||||
|
|
|
|||
|
|
@ -0,0 +1,95 @@
|
|||
|
||||
INTEL_G4A = dual_prime_igd.g4a \
|
||||
field_backward_igd.g4a \
|
||||
field_f_b_igd.g4a \
|
||||
field_forward_igd.g4a \
|
||||
frame_backward_igd.g4a \
|
||||
frame_f_b_igd.g4a \
|
||||
frame_forward_igd.g4a \
|
||||
dual_prime.g4a \
|
||||
field_backward.g4a \
|
||||
field_f_b.g4a \
|
||||
field_forward.g4a \
|
||||
frame_backward.g4a \
|
||||
frame_f_b.g4a \
|
||||
frame_forward.g4a \
|
||||
ipicture.g4a \
|
||||
null.g4a
|
||||
|
||||
INTEL_G4I = addidct.g4i \
|
||||
block_clear.g4i \
|
||||
read_frame_x0y0_y.g4i \
|
||||
read_frame_x0y1_y.g4i \
|
||||
read_frame_x1y0_y.g4i \
|
||||
read_frame_x1y1_y.g4i \
|
||||
read_frame_x0y0_uv.g4i \
|
||||
read_frame_x0y1_uv.g4i \
|
||||
read_frame_x1y0_uv.g4i \
|
||||
read_frame_x1y1_uv.g4i \
|
||||
read_frame_x0y0_y_igd.g4i \
|
||||
read_frame_x0y1_y_igd.g4i \
|
||||
read_frame_x1y0_y_igd.g4i \
|
||||
read_frame_x1y1_y_igd.g4i \
|
||||
read_frame_x0y0_uv_igd.g4i \
|
||||
read_frame_x0y1_uv_igd.g4i \
|
||||
read_frame_x1y0_uv_igd.g4i \
|
||||
read_frame_x1y1_uv_igd.g4i \
|
||||
motion_frame_y.g4i \
|
||||
motion_frame_uv.g4i \
|
||||
read_field_x0y0_y.g4i \
|
||||
read_field_x0y1_y.g4i \
|
||||
read_field_x1y0_y.g4i \
|
||||
read_field_x1y1_y.g4i \
|
||||
read_field_x0y0_uv.g4i \
|
||||
read_field_x0y1_uv.g4i \
|
||||
read_field_x1y0_uv.g4i \
|
||||
read_field_x1y1_uv.g4i \
|
||||
read_field_x0y0_y_igd.g4i \
|
||||
read_field_x0y1_y_igd.g4i \
|
||||
read_field_x1y0_y_igd.g4i \
|
||||
read_field_x1y1_y_igd.g4i \
|
||||
read_field_x0y0_uv_igd.g4i \
|
||||
read_field_x0y1_uv_igd.g4i \
|
||||
read_field_x1y0_uv_igd.g4i \
|
||||
read_field_x1y1_uv_igd.g4i \
|
||||
motion_field_y.g4i \
|
||||
motion_field_uv.g4i \
|
||||
motion_field_uv_igd.g4i \
|
||||
motion_field_y_igd.g4i \
|
||||
motion_frame_uv_igd.g4i \
|
||||
motion_frame_y_igd.g4i
|
||||
|
||||
INTEL_G4B = dual_prime.g4b \
|
||||
field_backward.g4b \
|
||||
field_f_b.g4b \
|
||||
field_forward.g4b \
|
||||
frame_backward.g4b \
|
||||
frame_f_b.g4b \
|
||||
frame_forward.g4b \
|
||||
dual_prime_igd.g4b \
|
||||
field_backward_igd.g4b \
|
||||
field_f_b_igd.g4b \
|
||||
field_forward_igd.g4b \
|
||||
frame_backward_igd.g4b \
|
||||
frame_f_b_igd.g4b \
|
||||
frame_forward_igd.g4b \
|
||||
ipicture.g4b \
|
||||
null.g4b
|
||||
|
||||
EXTRA_DIST = $(INTEL_G4A) \
|
||||
$(INTEL_G4I) \
|
||||
$(INTEL_G4B)
|
||||
|
||||
if HAVE_GEN4ASM
|
||||
|
||||
SUFFIXES = .g4a .g4b
|
||||
.g4a.g4b:
|
||||
m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
|
||||
|
||||
$(INTEL_G4B): $(INTEL_G4I)
|
||||
|
||||
BUILT_SOURCES= $(INTEL_G4B)
|
||||
|
||||
clean-local:
|
||||
-rm -f $(INTEL_G4B)
|
||||
endif
|
||||
Loading…
Reference in New Issue