projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into pipe-video
[mesa.git]
/
src
/
gallium
/
drivers
/
nvfx
/
Makefile
diff --git
a/src/gallium/drivers/nvfx/Makefile
b/src/gallium/drivers/nvfx/Makefile
index c1d57ca3969b10a27ea0d4c1e47ffe03a3fdc90d..95da778225616b0fce542d8839f6be890c39c433 100644
(file)
--- a/
src/gallium/drivers/nvfx/Makefile
+++ b/
src/gallium/drivers/nvfx/Makefile
@@
-4,7
+4,7
@@
include $(TOP)/configs/current
LIBNAME = nvfx
C_SOURCES = \
LIBNAME = nvfx
C_SOURCES = \
- nv04_
surface_
2d.c \
+ nv04_2d.c \
nvfx_buffer.c \
nvfx_context.c \
nvfx_clear.c \
nvfx_buffer.c \
nvfx_context.c \
nvfx_clear.c \
@@
-14,22
+14,18
@@
C_SOURCES = \
nv30_fragtex.c \
nv40_fragtex.c \
nvfx_miptree.c \
nv30_fragtex.c \
nv40_fragtex.c \
nvfx_miptree.c \
+ nvfx_push.c \
nvfx_query.c \
nvfx_resource.c \
nvfx_screen.c \
nvfx_state.c \
nvfx_query.c \
nvfx_resource.c \
nvfx_screen.c \
nvfx_state.c \
- nvfx_state_blend.c \
- nvfx_state_emit.c \
+ nvfx_state_emit.c \
nvfx_state_fb.c \
nvfx_state_fb.c \
- nvfx_state_rasterizer.c \
- nvfx_state_scissor.c \
- nvfx_state_stipple.c \
- nvfx_state_viewport.c \
- nvfx_state_zsa.c \
nvfx_surface.c \
nvfx_transfer.c \
nvfx_vbo.c \
nvfx_surface.c \
nvfx_transfer.c \
nvfx_vbo.c \
- nvfx_vertprog.c
+ nvfx_vertprog.c \
+ nvfx_video_context.c
LIBRARY_INCLUDES = \
-I$(TOP)/src/gallium/drivers/nouveau/include
LIBRARY_INCLUDES = \
-I$(TOP)/src/gallium/drivers/nouveau/include