diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-15 17:34:40 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-15 17:34:40 +0200 |
| commit | 26fe16a99b762d27e8f499c2e02116e9c4b7a6bb (patch) | |
| tree | 153d15f0e24f349d2ba6ec736ed5e4b8b961e824 /src/gallium/drivers/nv50/Makefile | |
| parent | 59ca1ae84b2c15c8a94211da158f563e45560bcd (diff) | |
| parent | 84d170bbcef8e26017ac8e2f3bacbaeb20f889d3 (diff) | |
Merge remote branch 'origin/nv50-compiler'
Conflicts:
src/gallium/drivers/nouveau/nouveau_class.h
src/gallium/drivers/nv50/nv50_screen.c
Diffstat (limited to 'src/gallium/drivers/nv50/Makefile')
| -rw-r--r-- | src/gallium/drivers/nv50/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/Makefile b/src/gallium/drivers/nv50/Makefile index e31e6f8662..bf1e8201a0 100644 --- a/src/gallium/drivers/nv50/Makefile +++ b/src/gallium/drivers/nv50/Makefile @@ -8,9 +8,9 @@ C_SOURCES = \ nv50_clear.c \ nv50_context.c \ nv50_draw.c \ + nv50_formats.c \ nv50_miptree.c \ nv50_query.c \ - nv50_program.c \ nv50_resource.c \ nv50_screen.c \ nv50_state.c \ @@ -19,6 +19,14 @@ C_SOURCES = \ nv50_tex.c \ nv50_transfer.c \ nv50_vbo.c \ - nv50_push.c + nv50_push.c \ + nv50_program.c \ + nv50_shader_state.c \ + nv50_pc.c \ + nv50_pc_print.c \ + nv50_pc_emit.c \ + nv50_tgsi_to_nc.c \ + nv50_pc_optimize.c \ + nv50_pc_regalloc.c include ../../Makefile.template |