fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code reorganization: update build.

Browse source 
Update the Makefiles and includes for the new paths.

Note that there hasn't been no separation of the Makefiles yet, and make is
jumping all over the place. That will be taken care shortly. But for now, make
should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm
might require some minor tweaks.
This commit is contained in:
José Fonseca 2008-02-15 17:50:12 +09:00
parent b642730be9
commit 6acd63a498
127 changed files with 445 additions and 241 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/beos
View file

@ -86,7 +86,7 @@ else
endif
# Directories
SRC_DIRS = mesa glu glut/beos
SRC_DIRS = gallium mesa glu glut/beos
GLU_DIRS = sgi
DRIVER_DIRS = beos
PROGRAM_DIRS = beos samples redbook demos tests

2
configs/darwin
View file

@ -25,5 +25,5 @@ GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
# omit glw lib for now:
SRC_DIRS = mesa glu glut/glx
SRC_DIRS = gallium mesa glu glut/glx

2
configs/darwin-x86ppc
View file

@ -29,5 +29,5 @@ GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
# omit glw lib for now:
SRC_DIRS = mesa glu glut/glx
SRC_DIRS = gallium mesa glu glut/glx

2
configs/default
View file

@ -60,7 +60,7 @@ GLW_SOURCES = GLwDrawA.c
# Directories to build
LIB_DIR = lib
SRC_DIRS = mesa glu glut/glx glw
SRC_DIRS = gallium mesa glu glut/glx glw
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
# Which subdirs under $(TOP)/progs/ to enter:

2
configs/freebsd-dri
View file

@ -36,7 +36,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11
# Directories
SRC_DIRS = glx/x11 mesa glu glut/glx glw
SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
DRIVER_DIRS = dri
PROGRAM_DIRS =
WINDOW_SYSTEM=dri

2
configs/linux-cell
View file

@ -21,7 +21,7 @@ CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(
CXXFLAGS = $(CFLAGS)
# Omitting glw here:
SRC_DIRS = mesa glu glut/glx
SRC_DIRS = gallium mesa glu glut/glx
MKDEP_OPTIONS = -fdepend -Y

2
configs/linux-directfb
View file

@ -22,7 +22,7 @@ ifeq ($(HAVE_X86), yes)
endif
# Directories
SRC_DIRS = mesa glu glut/directfb
SRC_DIRS = gallium mesa glu glut/directfb
GLU_DIRS = sgi
DRIVER_DIRS = directfb
PROGRAM_DIRS = demos directfb

6
configs/linux-dri
View file

@ -54,10 +54,10 @@ USING_EGL=0
# Directories
ifeq ($(USING_EGL), 1)
SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
PROGRAM_DIRS = egl
else
SRC_DIRS = glx/x11 mesa glu glut/glx glw
SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
PROGRAM_DIRS =
endif
@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
# gamma are missing because they have not been converted to use the new
# interface.
DRI_DIRS = intel_winsys
DRI_DIRS = intel

4
configs/linux-dri-xcb
View file

@ -53,10 +53,10 @@ USING_EGL=0
# Directories
ifeq ($(USING_EGL), 1)
SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
PROGRAM_DIRS = egl
else
SRC_DIRS = glx/x11 mesa glu glut/glx glw
SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
PROGRAM_DIRS =
endif

2
configs/linux-fbdev
View file

@ -6,7 +6,7 @@ CONFIG_NAME = linux-fbdev
CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
SRC_DIRS = mesa glu glut/fbdev
SRC_DIRS = gallium mesa glu glut/fbdev
DRIVER_DIRS = fbdev osmesa
PROGRAM_DIRS = fbdev demos redbook samples

2
configs/linux-osmesa
View file

@ -14,7 +14,7 @@ CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOUR
# Directories
SRC_DIRS = mesa glu
SRC_DIRS = gallium mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS = osdemos

2
configs/linux-osmesa16
View file

@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa16.so
# Directories
SRC_DIRS = mesa glu
SRC_DIRS = gallium mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =

2
configs/linux-osmesa16-static
View file

@ -18,7 +18,7 @@ OSMESA_LIB_NAME = libOSMesa16.a
# Directories
SRC_DIRS = mesa glu
SRC_DIRS = gallium mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =

2
configs/linux-osmesa32
View file

@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa32.so
# Directories
SRC_DIRS = mesa glu
SRC_DIRS = gallium mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =

2
configs/linux-solo
View file

@ -43,7 +43,7 @@ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
# Directories
SRC_DIRS = glx/mini mesa glu glut/mini
SRC_DIRS = glx/mini gallium mesa glu glut/mini
DRIVER_DIRS = dri
PROGRAM_DIRS = miniglx

12
src/gallium/Makefile
View file

@ -1,16 +1,8 @@
TOP = ../../..
TOP = ../..
include $(TOP)/configs/current
ifeq ($(CONFIG_NAME), linux-cell)
CELL_DIR = cell
endif
ifeq ($(CONFIG_NAME), linux-llvm)
LLVM_DIR = llvm
endif
SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR) $(LLVM_DIR)
SUBDIRS = aux drivers
default: subdirs

7
src/gallium/Makefile.template
View file

@ -15,7 +15,10 @@ OBJECTS = $(C_SOURCES:.c=.o) \
### Include directories
INCLUDES = \
-I. \
-I$(TOP)/src/mesa/pipe \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/include/pipe \
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/mesa \
-I$(TOP)/include \
$(DRIVER_INCLUDES)
@ -38,7 +41,7 @@ INCLUDES = \
default: depend symlinks $(LIBNAME)
$(LIBNAME): $(OBJECTS) Makefile $(TOP)/src/mesa/pipe/Makefile.template
$(LIBNAME): $(OBJECTS) Makefile $(TOP)/src/gallium/Makefile.template
$(TOP)/bin/mklib -o $@ -static $(OBJECTS) $(DRIVER_LIBS)

24
src/gallium/aux/Makefile Normal file
View file

@ -0,0 +1,24 @@
TOP = ../../..
include $(TOP)/configs/current
ifeq ($(CONFIG_NAME), linux-llvm)
LLVM_DIR = llvm
endif
SUBDIRS = pipebuffer $(LLVM_DIR)
default: subdirs
subdirs:
@for dir in $(SUBDIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE)) || exit 1 ; \
fi \
done
clean:
rm -f `find . -name \*.[oa]`

2
src/gallium/aux/draw/draw_private.h
View file

@ -45,7 +45,7 @@
#include "pipe/p_defines.h"
#include "x86/rtasm/x86sse.h"
#include "pipe/tgsi/exec/tgsi_exec.h"
#include "tgsi/exec/tgsi_exec.h"
struct gallivm_prog;

4
src/gallium/aux/draw/draw_vertex.c
View file

@ -34,8 +34,8 @@
*/
#include "pipe/draw/draw_private.h"
#include "pipe/draw/draw_vertex.h"
#include "draw/draw_private.h"
#include "draw/draw_vertex.h"
/**

4
src/gallium/aux/draw/draw_vertex_shader.c
View file

@ -34,13 +34,13 @@
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#if defined(__i386__) || defined(__386__)
#include "pipe/tgsi/exec/tgsi_sse2.h"
#include "tgsi/exec/tgsi_sse2.h"
#endif
#include "draw_private.h"
#include "draw_context.h"
#include "x86/rtasm/x86sse.h"
#include "pipe/llvm/gallivm.h"
#include "llvm/gallivm.h"
#define DBG_VS 0

4
src/gallium/aux/llvm/Makefile
View file

@ -30,7 +30,9 @@ OBJECTS = $(C_SOURCES:.c=.o) \
### Include directories
INCLUDES = \
-I. \
-I$(TOP)/src/mesa/pipe \
-I$(TOP)/src/gallium/drivers
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/mesa \
-I$(TOP)/include

4
src/gallium/aux/llvm/gallivm.cpp
View file

@ -42,8 +42,8 @@
#include "pipe/p_context.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/exec/tgsi_exec.h"
#include "pipe/tgsi/util/tgsi_dump.h"
#include "tgsi/exec/tgsi_exec.h"
#include "tgsi/util/tgsi_dump.h"
#include <llvm/Module.h>
#include <llvm/CallingConv.h>

4
src/gallium/aux/llvm/gallivm_cpu.cpp
View file

@ -42,8 +42,8 @@
#include "pipe/p_context.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/exec/tgsi_exec.h"
#include "pipe/tgsi/util/tgsi_dump.h"
#include "tgsi/exec/tgsi_exec.h"
#include "tgsi/util/tgsi_dump.h"
#include <llvm/Module.h>
#include <llvm/CallingConv.h>

10
src/gallium/aux/llvm/tgsitollvm.cpp
View file

@ -10,11 +10,11 @@
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "pipe/tgsi/exec/tgsi_exec.h"
#include "pipe/tgsi/util/tgsi_util.h"
#include "pipe/tgsi/util/tgsi_build.h"
#include "pipe/tgsi/util/tgsi_dump.h"
#include "tgsi/util/tgsi_parse.h"
#include "tgsi/exec/tgsi_exec.h"
#include "tgsi/util/tgsi_util.h"
#include "tgsi/util/tgsi_build.h"
#include "tgsi/util/tgsi_dump.h"
#include <llvm/Module.h>

2
src/gallium/aux/pipebuffer/Makefile
View file

@ -17,7 +17,7 @@ C_SOURCES = \
ASM_SOURCES =
include ../Makefile.template
include ../../Makefile.template
symlinks:

4
src/gallium/aux/tgsi/exec/tgsi_exec.c
View file

@ -54,8 +54,8 @@
#include "pipe/p_state.h"
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "pipe/tgsi/util/tgsi_util.h"
#include "tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_util.h"
#include "tgsi_exec.h"
#define TILE_TOP_LEFT 0

4
src/gallium/aux/tgsi/exec/tgsi_sse2.c
View file

@ -27,8 +27,8 @@
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "pipe/tgsi/util/tgsi_util.h"
#include "tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_util.h"
#include "tgsi_exec.h"
#include "tgsi_sse2.h"

4
src/gallium/aux/tgsi/util/tgsi_transform.h
View file

@ -31,8 +31,8 @@
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "pipe/tgsi/util/tgsi_build.h"
#include "tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_build.h"

24
src/gallium/drivers/Makefile Normal file
View file

@ -0,0 +1,24 @@
TOP = ../../..
include $(TOP)/configs/current
ifeq ($(CONFIG_NAME), linux-cell)
CELL_DIR = cell
endif
SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR)
default: subdirs
subdirs:
@for dir in $(SUBDIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE)) || exit 1 ; \
fi \
done
clean:
rm -f `find . -name \*.[oa]`

7
src/gallium/drivers/cell/ppu/Makefile
View file

@ -40,8 +40,11 @@ SOURCES = \
OBJECTS = $(SOURCES:.c=.o) \
INCLUDE_DIRS = -I$(TOP)/src/mesa
INCLUDE_DIRS = \
-I$(TOP)/src/mesa \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/drivers
.c.o:
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@

2
src/gallium/drivers/cell/ppu/cell_clear.c
View file

@ -35,7 +35,7 @@
#include <stdint.h>
#include "pipe/p_inlines.h"
#include "pipe/p_util.h"
#include "pipe/cell/common.h"
#include "cell/common.h"
#include "cell_clear.h"
#include "cell_context.h"
#include "cell_batch.h"

6
src/gallium/drivers/cell/ppu/cell_context.c
View file

@ -37,9 +37,9 @@
#include "pipe/p_format.h"
#include "pipe/p_util.h"
#include "pipe/p_winsys.h"
#include "pipe/cell/common.h"
#include "pipe/draw/draw_context.h"
#include "pipe/draw/draw_private.h"
#include "cell/common.h"
#include "draw/draw_context.h"
#include "draw/draw_private.h"
#include "cell_clear.h"
#include "cell_context.h"
#include "cell_draw_arrays.h"

6
src/gallium/drivers/cell/ppu/cell_context.h
View file

@ -32,10 +32,10 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/draw/draw_vertex.h"
#include "pipe/draw/draw_vbuf.h"
#include "draw/draw_vertex.h"
#include "draw/draw_vbuf.h"
#include "cell_winsys.h"
#include "pipe/cell/common.h"
#include "cell/common.h"
struct cell_vbuf_render;

2
src/gallium/drivers/cell/ppu/cell_draw_arrays.c
View file

@ -39,7 +39,7 @@
#include "cell_draw_arrays.h"
#include "cell_state.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"

2
src/gallium/drivers/cell/ppu/cell_flush.c
View file

@ -31,7 +31,7 @@
#include "cell_flush.h"
#include "cell_spu.h"
#include "cell_render.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
void

2
src/gallium/drivers/cell/ppu/cell_render.c
View file

@ -34,7 +34,7 @@
#include "cell_render.h"
#include "cell_spu.h"
#include "pipe/p_util.h"
#include "pipe/draw/draw_private.h"
#include "draw/draw_private.h"
struct render_stage {

2
src/gallium/drivers/cell/ppu/cell_spu.c
View file

@ -31,7 +31,7 @@
#include "cell_spu.h"
#include "pipe/p_format.h"
#include "pipe/p_state.h"
#include "pipe/cell/common.h"
#include "cell/common.h"
/*

2
src/gallium/drivers/cell/ppu/cell_spu.h
View file

@ -31,7 +31,7 @@
#include <libspe2.h>
#include <libmisc.h>
#include "pipe/cell/common.h"
#include "cell/common.h"
#include "cell_context.h"

2
src/gallium/drivers/cell/ppu/cell_state_blend.c
View file

@ -29,7 +29,7 @@
*/
#include "pipe/p_util.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "cell_context.h"
#include "cell_state.h"

2
src/gallium/drivers/cell/ppu/cell_state_clip.c
View file

@ -30,7 +30,7 @@
#include "cell_context.h"
#include "cell_state.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
void cell_set_clip_state( struct pipe_context *pipe,

4
src/gallium/drivers/cell/ppu/cell_state_derived.c
View file

@ -27,8 +27,8 @@
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/draw/draw_context.h"
#include "pipe/draw/draw_vertex.h"
#include "draw/draw_context.h"
#include "draw/draw_vertex.h"
#include "cell_context.h"
#include "cell_batch.h"
#include "cell_state.h"

8
src/gallium/drivers/cell/ppu/cell_state_fs.c
View file

@ -29,12 +29,12 @@
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#if 0
#include "pipe/p_shader_tokens.h"
#include "pipe/llvm/gallivm.h"
#include "pipe/tgsi/util/tgsi_dump.h"
#include "pipe/tgsi/exec/tgsi_sse2.h"
#include "llvm/gallivm.h"
#include "tgsi/util/tgsi_dump.h"
#include "tgsi/exec/tgsi_sse2.h"
#endif
#include "cell_context.h"

2
src/gallium/drivers/cell/ppu/cell_state_rasterizer.c
View file

@ -27,7 +27,7 @@
#include "pipe/p_defines.h"
#include "pipe/p_util.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "cell_context.h"
#include "cell_state.h"

2
src/gallium/drivers/cell/ppu/cell_state_sampler.c
View file

@ -30,7 +30,7 @@
*/
#include "pipe/p_util.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "cell_context.h"
#include "cell_state.h"
#include "cell_texture.h"

2
src/gallium/drivers/cell/ppu/cell_state_vertex.c
View file

@ -32,7 +32,7 @@
#include "cell_context.h"
#include "cell_state.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
void

2
src/gallium/drivers/cell/ppu/cell_surface.c
View file

@ -29,7 +29,7 @@
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "pipe/util/p_tile.h"
#include "util/p_tile.h"
#include "cell_context.h"
#include "cell_surface.h"

2
src/gallium/drivers/cell/ppu/cell_vbuf.c
View file

@ -36,7 +36,7 @@
#include "cell_flush.h"
#include "cell_spu.h"
#include "cell_vbuf.h"
#include "pipe/draw/draw_vbuf.h"
#include "draw/draw_vbuf.h"
/** Allow vertex data to be inlined after RENDER command */

6
src/gallium/drivers/cell/ppu/cell_vertex_shader.c
View file

@ -38,9 +38,9 @@
#include "cell_spu.h"
#include "cell_batch.h"
#include "pipe/cell/common.h"
#include "pipe/draw/draw_context.h"
#include "pipe/draw/draw_private.h"
#include "cell/common.h"
#include "draw/draw_context.h"
#include "draw/draw_private.h"
/**
* Run the vertex shader on all vertices in the vertex queue.

6
src/gallium/drivers/cell/spu/Makefile
View file

@ -31,7 +31,11 @@ SPU_OBJECTS = $(SOURCES:.c=.o) \
SPU_ASM_OUT = $(SOURCES:.c=.s) \
INCLUDE_DIRS = -I$(TOP)/src/mesa
INCLUDE_DIRS = \
-I$(TOP)/src/mesa \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/drivers
.c.o:

4
src/gallium/drivers/cell/spu/spu_exec.c
View file

@ -67,8 +67,8 @@
#include "pipe/p_state.h"
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "pipe/tgsi/util/tgsi_util.h"
#include "tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_util.h"
#include "spu_exec.h"
#include "spu_main.h"
#include "spu_vertex_shader.h"

2
src/gallium/drivers/cell/spu/spu_exec.h
View file

@ -29,7 +29,7 @@
#define SPU_EXEC_H
#include "pipe/p_compiler.h"
#include "pipe/tgsi/exec/tgsi_exec.h"
#include "tgsi/exec/tgsi_exec.h"
#if defined __cplusplus
extern "C" {

2
src/gallium/drivers/cell/spu/spu_main.c
View file

@ -38,7 +38,7 @@
#include "spu_tile.h"
//#include "spu_test.h"
#include "spu_vertex_shader.h"
#include "pipe/cell/common.h"
#include "cell/common.h"
#include "pipe/p_defines.h"

4
src/gallium/drivers/cell/spu/spu_main.h
View file

@ -31,8 +31,8 @@
#include <spu_mfcio.h>
#include "pipe/cell/common.h"
#include "pipe/draw/draw_vertex.h"
#include "cell/common.h"
#include "draw/draw_vertex.h"
#include "pipe/p_state.h"

2
src/gallium/drivers/cell/spu/spu_render.c
View file

@ -34,7 +34,7 @@
#include "spu_render.h"
#include "spu_tri.h"
#include "spu_tile.h"
#include "pipe/cell/common.h"
#include "cell/common.h"

2
src/gallium/drivers/cell/spu/spu_render.h
View file

@ -29,7 +29,7 @@
#ifndef SPU_RENDER_H
#define SPU_RENDER_H
#include "pipe/cell/common.h"
#include "cell/common.h"
extern void
cmd_render(const struct cell_command_render *render, uint *pos_incr);

2
src/gallium/drivers/cell/spu/spu_tile.h
View file

@ -32,7 +32,7 @@
#include <libmisc.h>
#include <spu_mfcio.h>
#include "spu_main.h"
#include "pipe/cell/common.h"
#include "cell/common.h"

4
src/gallium/drivers/cell/spu/spu_util.c
View file

@ -1,8 +1,8 @@
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_parse.h"
//#include "tgsi_build.h"
#include "pipe/tgsi/util/tgsi_util.h"
#include "tgsi/util/tgsi_util.h"
unsigned
tgsi_util_get_src_register_swizzle(

6
src/gallium/drivers/cell/spu/spu_vertex_shader.c
View file

@ -39,9 +39,9 @@
#include "pipe/p_shader_tokens.h"
#include "spu_vertex_shader.h"
#include "spu_exec.h"
#include "pipe/draw/draw_private.h"
#include "pipe/draw/draw_context.h"
#include "pipe/cell/common.h"
#include "draw/draw_private.h"
#include "draw/draw_context.h"
#include "cell/common.h"
#include "spu_main.h"
static INLINE unsigned

2
src/gallium/drivers/failover/Makefile
View file

@ -15,7 +15,7 @@ C_SOURCES = \
ASM_SOURCES =
include ../Makefile.template
include ../../Makefile.template
symlinks:

2
src/gallium/drivers/i915simple/Makefile
View file

@ -32,7 +32,7 @@ C_SOURCES = \
ASM_SOURCES =
include ../Makefile.template
include ../../Makefile.template
symlinks:

2
src/gallium/drivers/i915simple/i915_context.c
View file

@ -32,7 +32,7 @@
#include "i915_texture.h"
#include "i915_reg.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_winsys.h"
#include "pipe/p_util.h"

2
src/gallium/drivers/i915simple/i915_context.h
View file

@ -33,7 +33,7 @@
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "pipe/draw/draw_vertex.h"
#include "draw/draw_vertex.h"
#define I915_TEX_UNITS 8

4
src/gallium/drivers/i915simple/i915_fpc_translate.c
View file

@ -33,9 +33,9 @@
#include "i915_fpc.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_parse.h"
#include "pipe/draw/draw_vertex.h"
#include "draw/draw_vertex.h"
/**

2
src/gallium/drivers/i915simple/i915_prim_emit.c
View file

@ -26,7 +26,7 @@
**************************************************************************/
#include "pipe/draw/draw_private.h"
#include "draw/draw_private.h"
#include "pipe/p_util.h"
#include "i915_context.h"

2
src/gallium/drivers/i915simple/i915_prim_vbuf.c
View file

@ -38,7 +38,7 @@
*/
#include "pipe/draw/draw_vbuf.h"
#include "draw/draw_vbuf.h"
#include "pipe/p_debug.h"
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"

2
src/gallium/drivers/i915simple/i915_state.c
View file

@ -29,7 +29,7 @@
*/
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "pipe/p_winsys.h"
#include "pipe/p_util.h"

4
src/gallium/drivers/i915simple/i915_state_derived.c
View file

@ -27,8 +27,8 @@
#include "pipe/p_util.h"
#include "pipe/draw/draw_context.h"
#include "pipe/draw/draw_vertex.h"
#include "draw/draw_context.h"
#include "draw/draw_vertex.h"
#include "i915_context.h"
#include "i915_state.h"
#include "i915_reg.h"

2
src/gallium/drivers/i915simple/i915_strings.c
View file

@ -70,7 +70,7 @@ static const char *i915_get_name( struct pipe_context *pipe )
break;
}
sprintf(buffer, "pipe/i915 (chipset: %s)", chipset);
sprintf(buffer, "i915 (chipset: %s)", chipset);
return buffer;
}

2
src/gallium/drivers/i915simple/i915_surface.c
View file

@ -33,7 +33,7 @@
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "pipe/util/p_tile.h"
#include "util/p_tile.h"
/*

2
src/gallium/drivers/i965simple/Makefile
View file

@ -61,6 +61,6 @@ ASM_SOURCES =
DRIVER_DEFINES = -I.
include ../Makefile.template
include ../../Makefile.template
symlinks:

2
src/gallium/drivers/i965simple/brw_shader_info.c
View file

@ -3,7 +3,7 @@
#include "brw_state.h"
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_parse.h"

2
src/gallium/drivers/i965simple/brw_state.c
View file

@ -33,7 +33,7 @@
#include "pipe/p_winsys.h"
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_dump.h"
#include "tgsi/util/tgsi_dump.h"
#include "brw_context.h"
#include "brw_defines.h"

2
src/gallium/drivers/i965simple/brw_strings.c
View file

@ -59,7 +59,7 @@ static const char *brw_get_name( struct pipe_context *pipe )
break;
}
sprintf(buffer, "pipe/i965 (chipset: %s)", chipset);
sprintf(buffer, "i965 (chipset: %s)", chipset);
return buffer;
}

2
src/gallium/drivers/i965simple/brw_surface.c
View file

@ -32,7 +32,7 @@
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "pipe/util/p_tile.h"
#include "util/p_tile.h"
/*

2
src/gallium/drivers/i965simple/brw_vs_emit.c
View file

@ -33,7 +33,7 @@
#include "brw_vs.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_parse.h"
struct brw_prog_info {
unsigned num_temps;

2
src/gallium/drivers/i965simple/brw_wm_decl.c
View file

@ -4,7 +4,7 @@
#include "brw_wm.h"
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_parse.h"
static struct brw_reg alloc_tmp(struct brw_wm_compile *c)
{

2
src/gallium/drivers/i965simple/brw_wm_glsl.c
View file

@ -4,7 +4,7 @@
#include "brw_wm.h"
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/tgsi/util/tgsi_parse.h"
#include "tgsi/util/tgsi_parse.h"

2
src/gallium/drivers/softpipe/Makefile
View file

@ -44,7 +44,7 @@ C_SOURCES = \
ASM_SOURCES =
include ../Makefile.template
include ../../Makefile.template
symlinks:

2
src/gallium/drivers/softpipe/sp_context.c
View file

@ -29,7 +29,7 @@
* Keith Whitwell <keith@tungstengraphics.com>
*/
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
#include "pipe/p_util.h"

2
src/gallium/drivers/softpipe/sp_context.h
View file

@ -34,7 +34,7 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/draw/draw_vertex.h"
#include "draw/draw_vertex.h"
#include "sp_quad.h"

2
src/gallium/drivers/softpipe/sp_draw_arrays.c
View file

@ -38,7 +38,7 @@
#include "sp_context.h"
#include "sp_state.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"

2
src/gallium/drivers/softpipe/sp_flush.c
View file

@ -31,7 +31,7 @@
#include "pipe/p_defines.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "sp_flush.h"
#include "sp_context.h"
#include "sp_surface.h"

2
src/gallium/drivers/softpipe/sp_headers.h
View file

@ -31,7 +31,7 @@
#ifndef SP_HEADERS_H
#define SP_HEADERS_H
#include "pipe/tgsi/exec/tgsi_exec.h"
#include "tgsi/exec/tgsi_exec.h"
#define PRIM_POINT 1
#define PRIM_LINE 2

4
src/gallium/drivers/softpipe/sp_prim_setup.c
View file

@ -38,8 +38,8 @@
#include "sp_quad.h"
#include "sp_state.h"
#include "sp_prim_setup.h"
#include "pipe/draw/draw_private.h"
#include "pipe/draw/draw_vertex.h"
#include "draw/draw_private.h"
#include "draw/draw_vertex.h"
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"

6
src/gallium/drivers/softpipe/sp_prim_vbuf.c
View file

@ -39,9 +39,9 @@
#include "sp_context.h"
#include "sp_state.h"
#include "sp_prim_vbuf.h"
#include "pipe/draw/draw_context.h"
#include "pipe/draw/draw_private.h"
#include "pipe/draw/draw_vbuf.h"
#include "draw/draw_context.h"
#include "draw/draw_private.h"
#include "draw/draw_vbuf.h"
#define SP_MAX_VBUF_INDEXES 1024

2
src/gallium/drivers/softpipe/sp_quad_fs.c
View file

@ -42,7 +42,7 @@
#include "x86/rtasm/x86sse.h"
#ifdef MESA_LLVM
#include "pipe/llvm/gallivm.h"
#include "llvm/gallivm.h"
#endif
#include "sp_context.h"

2
src/gallium/drivers/softpipe/sp_query.c
View file

@ -29,7 +29,7 @@
* Keith Whitwell <keith@tungstengraphics.com>
*/
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
#include "pipe/p_util.h"

2
src/gallium/drivers/softpipe/sp_state_clip.c
View file

@ -29,7 +29,7 @@
*/
#include "sp_context.h"
#include "sp_state.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
void softpipe_set_clip_state( struct pipe_context *pipe,

6
src/gallium/drivers/softpipe/sp_state_derived.c
View file

@ -27,9 +27,9 @@
#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/draw/draw_context.h"
#include "pipe/draw/draw_vertex.h"
#include "pipe/draw/draw_private.h"
#include "draw/draw_context.h"
#include "draw/draw_vertex.h"
#include "draw/draw_private.h"
#include "sp_context.h"
#include "sp_state.h"

8
src/gallium/drivers/softpipe/sp_state_fs.c
View file

@ -32,11 +32,11 @@
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/llvm/gallivm.h"
#include "pipe/tgsi/util/tgsi_dump.h"
#include "pipe/tgsi/exec/tgsi_sse2.h"
#include "llvm/gallivm.h"
#include "tgsi/util/tgsi_dump.h"
#include "tgsi/exec/tgsi_sse2.h"
void *

2
src/gallium/drivers/softpipe/sp_state_rasterizer.c
View file

@ -29,7 +29,7 @@
#include "pipe/p_util.h"
#include "sp_context.h"
#include "sp_state.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"

4
src/gallium/drivers/softpipe/sp_state_sampler.c
View file

@ -31,14 +31,14 @@
#include "pipe/p_util.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
#include "sp_context.h"
#include "sp_context.h"
#include "sp_state.h"
#include "sp_texture.h"
#include "sp_tile_cache.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"

2
src/gallium/drivers/softpipe/sp_state_vertex.c
View file

@ -33,7 +33,7 @@
#include "sp_state.h"
#include "sp_surface.h"
#include "pipe/draw/draw_context.h"
#include "draw/draw_context.h"
void

2
src/gallium/drivers/softpipe/sp_surface.c
View file

@ -29,7 +29,7 @@
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "pipe/util/p_tile.h"
#include "util/p_tile.h"
#include "sp_context.h"
#include "sp_surface.h"

2
src/gallium/drivers/softpipe/sp_tex_sample.c
View file

@ -40,7 +40,7 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_util.h"
#include "pipe/tgsi/exec/tgsi_exec.h"
#include "tgsi/exec/tgsi_exec.h"
/*

2
src/gallium/drivers/softpipe/sp_tile_cache.c
View file

@ -34,7 +34,7 @@
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "pipe/util/p_tile.h"
#include "util/p_tile.h"
#include "sp_context.h"
#include "sp_surface.h"
#include "sp_tile_cache.h"

38
src/gallium/winsys/dri/Makefile Normal file
View file

@ -0,0 +1,38 @@
# src/mesa/drivers/dri/Makefile
TOP = ../../../..
include $(TOP)/configs/current
default: $(TOP)/$(LIB_DIR) subdirs
$(TOP)/$(LIB_DIR):
-mkdir $(TOP)/$(LIB_DIR)
subdirs:
@for dir in $(DRI_DIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE)) || exit 1 ; \
fi \
done
install:
@for dir in $(DRI_DIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE) install) || exit 1 ; \
fi \
done
clean:
@for dir in $(DRI_DIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE) clean) ; \
fi \
done
-rm -f common/*.o

113
src/gallium/winsys/dri/Makefile.template Normal file
View file

@ -0,0 +1,113 @@
# -*-makefile-*-
MESA_MODULES = $(TOP)/src/mesa/libmesa.a
COMMON_GALLIUM_SOURCES = \
$(TOP)/src/mesa/drivers/dri/common/utils.c \
$(TOP)/src/mesa/drivers/dri/common/vblank.c \
$(TOP)/src/mesa/drivers/dri/common/dri_util.c \
$(TOP)/src/mesa/drivers/dri/common/xmlconfig.c
COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
$(TOP)/src/mesa/drivers/common/driverfuncs.c \
$(TOP)/src/mesa/drivers/dri/common/texmem.c \
$(TOP)/src/mesa/drivers/dri/common/drirenderbuffer.c
COMMON_BM_SOURCES = \
$(TOP)/src/mesa/drivers/dri/common/dri_bufmgr.c \
$(TOP)/src/mesa/drivers/dri/common/dri_drmpool.c
ifeq ($(WINDOW_SYSTEM),dri)
WINOBJ=
WINLIB=
INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
OBJECTS = $(C_SOURCES:.c=.o) \
$(ASM_SOURCES:.S=.o)
else
# miniglx
WINOBJ=
WINLIB=-L$(MESA)/src/glx/mini
MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
INCLUDES = $(MINIGLX_INCLUDES) \
$(SHARED_INCLUDES) \
$(PCIACCESS_CFLAGS)
OBJECTS = $(C_SOURCES:.c=.o) \
$(MINIGLX_SOURCES:.c=.o) \
$(ASM_SOURCES:.S=.o)
endif
### Include directories
SHARED_INCLUDES = \
-I. \
-I$(TOP)/src/mesa/drivers/dri/common \
-Iserver \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
-I$(TOP)/src/mesa/math \
-I$(TOP)/src/mesa/transform \
-I$(TOP)/src/mesa/shader \
-I$(TOP)/src/mesa/swrast \
-I$(TOP)/src/mesa/swrast_setup \
-I$(TOP)/src/egl/main \
-I$(TOP)/src/egl/drivers/dri \
$(LIBDRM_CFLAGS)
##### RULES #####
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
.S.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
##### TARGETS #####
default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
$(TOP)/bin/mklib -noprefix -o $@ \
$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)
depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
rm -f depend
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
$(ASM_SOURCES) 2> /dev/null
# Emacs tags
tags:
etags `find . -name \*.[ch]` `find ../include`
# Remove .o and backup files
clean:
-rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)
-rm -f depend depend.bak
install: $(LIBNAME)
$(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR)
$(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR)
include depend

8
src/gallium/winsys/dri/intel/Makefile
View file

@ -7,8 +7,8 @@ LIBNAME = i915tex_dri.so
MINIGLX_SOURCES = server/intel_dri.c
PIPE_DRIVERS = \
$(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a \
$(TOP)/src/mesa/pipe/i915simple/libi915simple.a
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/i915simple/libi915simple.a
DRIVER_SOURCES = \
intel_winsys_pipe.c \
@ -28,11 +28,11 @@ C_SOURCES = \
ASM_SOURCES =
DRIVER_DEFINES = -I../intel $(shell pkg-config libdrm --atleast-version=2.3.1 \
DRIVER_DEFINES = -I$(TOP)/src/mesa/drivers/dri/intel $(shell pkg-config libdrm --atleast-version=2.3.1 \
&& echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
include ../Makefile.template
intel_tex_layout.o: ../intel/intel_tex_layout.c
intel_tex_layout.o: $(TOP)/src/mesa/drivers/dri/intel/intel_tex_layout.c
symlinks:

Some files were not shown because too many files have changed in this diff Show more