gmane.comp.video.mesa3d.devel

Re: [PATCH 04/11] clover: Add a function for retrievinga device's preferred ir v2

Francisco Jerez — 2012-05-25T02:30:24


It doesn't look like this include is necessary.


If you're assuming that 'target' is NULL-terminated, why don't you use
the normal constructor of std::string that takes a 'char *' as argument?

Like:
| return { target.data() };

_______________________________________________
mesa-dev mailing list
mesa-dev< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [PATCH 03/11] gallium/compute: AddPIPE_COMPUTE_CAP_IR_TARGET

Francisco Jerez — 2012-05-25T02:29:11


This documentation seems wrong now, the CAP isn't used to determine the
representation of the compute program anymore, and it has nothing to do
with TGSI being used or not.

_______________________________________________
mesa-dev mailing list
mesa-dev< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [PATCH 02/11] gallium: Add PIPE_SHADER_IR_LLVM toenum pipe_shader_ir v2

Francisco Jerez — 2012-05-25T02:27:57


Reviewed-by: Francisco Jerez <currojerez< at >riseup.net>
_______________________________________________
mesa-dev mailing list
mesa-dev< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [PATCH 10/11] clover: Add function for building aclover::module for non-TGSI targets v3

Francisco Jerez — 2012-05-25T02:27:22


Just pass dev->ir_target() to compile_program_tgsi() as it was done
before, or remove the argument if you want, it's useless anyway.


OK, I think I didn't explain myself correctly when I suggested you to
use a "struct"...  What I meant is, if this convention of storing the
bitcode size at the beginning of an LLVM program is part of the state
tracker/driver interface, wouldn't it make sense to define it as a
struct in some public header file?

_______________________________________________
mesa-dev mailing list
mesa-dev< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: Doing 8.0.1 release?

Jeremy Huddleston — 2012-05-25T02:08:54

On May 24, 2012, at 11:36, Matt Turner <mattst88< at >gmail.com> wrote:


It's a packaging bug.  The generated source should be packaged with the tarball like other generated source (flex, bison, etc).  MesaLib tarballs have sometimes contained and sometimes missed these files, and I'd like it to be consistent.  Yes, I can use a python with that module, but the build system I use for XQuartz (namely a vanilla OS X) does not come with that python module, and I frequently forget to install it or change to a different python when I roll a build.

Re: No more make clean!

Matt Turner — 2012-05-25T01:43:54

Awesome. One step closer.

With the small typos fixed in 7/8, this series is

Reviewed-by: Matt Turner <mattst88< at >gmail.com>

Re: [PATCH 7/8] automake: Convert dricore building toautomake.

Matt Turner — 2012-05-25T01:42:17

$DRIVER_DIRS (missing $)


$ASM_FLAGS (missing $)

[PATCH 6/6] mesa: Fix hash table leak

Stéphane Marchesin — 2012-05-25T01:29:48

From: Antoine Labour <piman< at >chromium.org>

When a value was replaced, the new key was strdup'd and leaked.
To fix this, we modify the hash table implementation to return
whether the value was replaced and free() the (now useless)
duplicate string.
---
 src/mesa/program/hash_table.c |    5 +++--
 src/mesa/program/hash_table.h |   16 ++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/mesa/program/hash_table.c b/src/mesa/program/hash_table.c
index dc8563a..067c20b 100644
--- a/src/mesa/program/hash_table.c
+++ b/src/mesa/program/hash_table.c
< at >< at > -149,7 +149,7 < at >< at > hash_table_insert(struct hash_table *ht, void *data, const void *key)
     insert_at_head(& ht->buckets[bucket], & node->link);
 }
 
-void
+int
 hash_table_replace(struct hash_table *ht, void *data, const void *key)
 {
     const unsigned hash_value = (*ht->hash)(key);
< at >< at > -162,7 +162,7 < at >< at > hash_table_replace(struct hash_table *ht, void *data, const void *key)
 
        if ((*ht->compare)(hn->key, key) == 0) {
   hn->data = data;
-  return;
+  return 1;
        }
     }
 
< at >< at > -172,6 +172,7 < at >< at > hash_table_replace(struct hash_table *ht, void *data, const void *key)
     hn->key = key;
 
     insert_at_head(& ht->buckets[bucket], & hn->link);
+    return 0;
 }
 
 void
diff --git a/src/mesa/program/hash_table.h b/src/mesa/program/hash_table.h
index bcf65df..a14bf13 100644
--- a/src/mesa/program/hash_table.h
+++ b/src/mesa/program/hash_table.h
< at >< at > -114,6 +114,10 < at >< at > extern void hash_table_insert(struct hash_table *ht, void *data,
 /**
  * Add an element to a hash table with replacement
  *
+ * \return
+ * 1 if it did replace the the value (in which case the old key is kept), 0 if
+ * it did not replace the value (in which case the new key is kept).
+ *
  * \warning
  * If \c key is already in the hash table, \c data will \b replace the most
  * recently inserted \c data (see the warning in \c hash_table_insert) for
< at >< at > -121,7 +125,7 < at >< at > extern void hash_table_insert(struct hash_table *ht, void *data,
  *
  * \sa hash_table_insert
  */
-extern void hash_table_replace(struct hash_table *ht, void *data,
+extern int hash_table_replace(struct hash_table *ht, void *data,
     const void *key);
 
 /**
< at >< at > -219,6 +223,7 < at >< at > public:
     */
    void clear()
    {
+      hash_table_call_foreach(this->ht, delete_key, NULL);
       hash_table_clear(this->ht);
    }
 
< at >< at > -258,9 +263,12 < at >< at > public:
        * because UINT_MAX+1 = 0.
        */
       assert(value != UINT_MAX);
-      hash_table_replace(this->ht,
- (void *) (intptr_t) (value + 1),
- strdup(key));
+      char *dup_key = strdup(key);
+      int result = hash_table_replace(this->ht,
+      (void *) (intptr_t) (value + 1),
+      dup_key);
+      if (result)
+ free(dup_key);
    }
 
 private:

[PATCH 5/6] mesa: Free uniforms correclty.

Stéphane Marchesin — 2012-05-25T01:29:47

From: Antoine Labour <piman< at >chromium.org>

This is an array of uniforms, not a single one.
---
 src/mesa/main/shaderobj.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 7eb6f0b..d5ebf54 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
< at >< at > -278,7 +278,8 < at >< at > _mesa_clear_shader_program_data(struct gl_context *ctx,
                                 struct gl_shader_program *shProg)
 {
    if (shProg->UniformStorage) {
-      _mesa_uniform_detach_all_driver_storage(shProg->UniformStorage);
+      for (unsigned i = 0; i < shProg->NumUserUniformStorage; ++i)
+         _mesa_uniform_detach_all_driver_storage(&shProg->UniformStorage[i]);
       ralloc_free(shProg->UniformStorage);
       shProg->NumUserUniformStorage = 0;
       shProg->UniformStorage = NULL;

[PATCH 4/6] meta: Cleanup the resources we allocate.

Stéphane Marchesin — 2012-05-25T01:29:46

From: Antoine Labour <piman< at >chromium.org>

When we have multiple shared contexts, and one of them is
long-running, this will lead to never freeing those resources
since they are shared. Instead, free them right away on context
destruction since we know the other context isn't using them.
---
 src/mesa/drivers/common/meta.c |   72 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 95336fc..a52de86 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
< at >< at > -319,6 +319,10 < at >< at > struct gl_meta_state
    struct drawtex_state DrawTex;  /**< For _mesa_meta_DrawTex() */
 };
 
+static void meta_glsl_blit_cleanup(struct gl_context *ctx, struct blit_state *blit);
+static void cleanup_temp_texture(struct gl_context *ctx, struct temp_texture *tex);
+static void meta_glsl_clear_cleanup(struct gl_context *ctx, struct clear_state *clear);
+
 static GLuint
 compile_shader_with_debug(struct gl_context *ctx, GLenum target, const GLcharARB *source)
 {
< at >< at > -335,12 +339,16 < at >< at > compile_shader_with_debug(struct gl_context *ctx, GLenum target, const GLcharARB
       return shader;
 
    _mesa_GetShaderiv(shader, GL_INFO_LOG_LENGTH, &size);
-   if (size == 0)
+   if (size == 0) {
+      _mesa_DeleteObjectARB(shader);
       return 0;
+   }
 
    info = malloc(size);
-   if (!info)
+   if (!info) {
+      _mesa_DeleteObjectARB(shader);
       return 0;
+   }
 
    _mesa_GetProgramInfoLog(shader, size, NULL, info);
    _mesa_problem(ctx,
< at >< at > -349,6 +357,7 < at >< at > compile_shader_with_debug(struct gl_context *ctx, GLenum target, const GLcharARB
  info, source);
 
    free(info);
+   _mesa_DeleteObjectARB(shader);
 
    return 0;
 }
< at >< at > -401,10 +410,15 < at >< at > _mesa_meta_init(struct gl_context *ctx)
 void
 _mesa_meta_free(struct gl_context *ctx)
 {
-   /* Note: Any textures, VBOs, etc, that we allocate should get
-    * freed by the normal context destruction code.  But this would be
-    * the place to free other meta data someday.
-    */
+   GET_CURRENT_CONTEXT(old_context);
+   _mesa_make_current(ctx, NULL, NULL);
+   meta_glsl_blit_cleanup(ctx, &ctx->Meta->Blit);
+   meta_glsl_clear_cleanup(ctx, &ctx->Meta->Clear);
+   cleanup_temp_texture(ctx, &ctx->Meta->TempTex);
+   if (old_context)
+      _mesa_make_current(old_context, old_context->WinSysDrawBuffer, old_context->WinSysReadBuffer);
+   else
+      _mesa_make_current(NULL, NULL, NULL);
    free(ctx->Meta);
    ctx->Meta = NULL;
 }
< at >< at > -1068,6 +1082,15 < at >< at > init_temp_texture(struct gl_context *ctx, struct temp_texture *tex)
    _mesa_GenTextures(1, &tex->TexObj);
 }
 
+static void
+cleanup_temp_texture(struct gl_context *ctx, struct temp_texture *tex)
+{
+   if (!tex->TexObj)
+     return;
+   _mesa_DeleteTextures(1, &tex->TexObj);
+   tex->TexObj = 0;
+}
+
 
 /**
  * Return pointer to temp_texture info for non-bitmap ops.
< at >< at > -1604,6 +1627,21 < at >< at > _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
    }
 }
 
+static void
+meta_glsl_blit_cleanup(struct gl_context *ctx, struct blit_state *blit)
+{
+   if (blit->ArrayObj) {
+      _mesa_DeleteVertexArraysAPPLE(1, &blit->ArrayObj);
+      blit->ArrayObj = 0;
+      _mesa_DeleteBuffersARB(1, &blit->VBO);
+      blit->VBO = 0;
+   }
+   if (blit->DepthFP) {
+      _mesa_DeletePrograms(1, &blit->DepthFP);
+      blit->DepthFP = 0;
+   }
+}
+
 
 /**
  * Meta implementation of ctx->Driver.Clear() in terms of polygon rendering.
< at >< at > -1786,7 +1824,9 < at >< at > meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
 
    clear->ShaderProg = _mesa_CreateProgramObjectARB();
    _mesa_AttachShader(clear->ShaderProg, fs);
+   _mesa_DeleteObjectARB(fs);
    _mesa_AttachShader(clear->ShaderProg, vs);
+   _mesa_DeleteObjectARB(vs);
    _mesa_BindAttribLocationARB(clear->ShaderProg, 0, "position");
    _mesa_LinkProgramARB(clear->ShaderProg);
 
< at >< at > -1799,7 +1839,9 < at >< at > meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
 
       clear->IntegerShaderProg = _mesa_CreateProgramObjectARB();
       _mesa_AttachShader(clear->IntegerShaderProg, fs);
+      _mesa_DeleteObjectARB(fs);
       _mesa_AttachShader(clear->IntegerShaderProg, vs);
+      _mesa_DeleteObjectARB(vs);
       _mesa_BindAttribLocationARB(clear->IntegerShaderProg, 0, "position");
 
       /* Note that user-defined out attributes get automatically assigned
< at >< at > -1814,6 +1856,24 < at >< at > meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
    }
 }
 
+static void
+meta_glsl_clear_cleanup(struct gl_context *ctx, struct clear_state *clear)
+{
+   if (clear->ArrayObj == 0)
+      return;
+   _mesa_DeleteVertexArraysAPPLE(1, &clear->ArrayObj);
+   clear->ArrayObj = 0;
+   _mesa_DeleteBuffersARB(1, &clear->VBO);
+   clear->VBO = 0;
+   _mesa_DeleteObjectARB(clear->ShaderProg);
+   clear->ShaderProg = 0;
+
+   if (clear->IntegerShaderProg) {
+      _mesa_DeleteObjectARB(clear->IntegerShaderProg);
+      clear->IntegerShaderProg = 0;
+   }
+}
+
 /**
  * Meta implementation of ctx->Driver.Clear() in terms of polygon rendering.
  */

[PATCH 3/6] mesa/Makefile: Fix a race in the build.

Stéphane Marchesin — 2012-05-25T01:29:45

From: Mike Frysinger <vapier< at >chromium.org>

The intent of the message above it is right (we need to build those
dependencies in that order) but the implementation is wrong, as it
can be executed in any order. To enforce the order, invoke make
multiple times.
---
 src/mesa/Makefile |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 71e22b9..ce38081 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
< at >< at > -65,7 +65,10 < at >< at > $(DRICORE_OBJ_DIR)/%.o: %.S
 
 # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
 # then convenience libs (.a) and finally the device drivers:
-default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
+default: $(DEPENDS)
+$(MAKE) asm_subdirs
+$(MAKE) $(MESA_LIBS) $(DRICORE_LIBS)
+$(MAKE) driver_subdirs
 
 # include glapi_gen.mk for generating glapi headers for GLES
 GLAPI := $(TOP)/src/mapi/glapi/gen

[PATCH 2/6] glx: Handle a null reply in QueryVersion.

Stéphane Marchesin — 2012-05-25T01:29:44

Works around crashes when X connections break.
---
 src/glx/glxext.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 12fff22..a4e76c1 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
< at >< at > -293,6 +293,9 < at >< at > QueryVersion(Display * dpy, int opcode, int *major, int *minor)
                                                                        GLX_MINOR_VERSION),
                                                                       NULL);
 
+   if (!reply)
+     return GL_FALSE;
+
    if (reply->major_version != GLX_MAJOR_VERSION) {
       free(reply);
       return GL_FALSE;

[PATCH 1/6] st/mesa: Don't flush the front buffer

Stéphane Marchesin — 2012-05-25T01:29:43

We might not even have a frontbuffer bound, this is the wrong place to do
this, and this is not needed, so remove it.
---
 src/mesa/state_tracker/st_manager.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index d54b7ed..5990eaf 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
< at >< at > -460,8 +460,6 < at >< at > st_context_flush(struct st_context_iface *stctxi, unsigned flags,
 {
    struct st_context *st = (struct st_context *) stctxi;
    st_flush(st, fence);
-   if (flags & ST_FLUSH_FRONT)
-      st_manager_flush_frontbuffer(st);
 }
 
 static boolean

[PATCH 4/8] mesa: Remove generated source files duringmake clean.

Eric Anholt — 2012-05-24T23:45:08

---
 src/mesa/Makefile |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index bb7b13a..4783f32 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
< at >< at > -71,6 +71,17 < at >< at > default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
 GLAPI := $(TOP)/src/mapi/glapi/gen
 include $(GLAPI)/glapi_gen.mk
 
+BUILT_SOURCES = \
+main/api_exec_es1_dispatch.h \
+main/api_exec_es1_remap_helper.h \
+main/api_exec_es2_dispatch.h \
+main/api_exec_es2_remap_helper.h \
+main/api_exec_es1.c \
+main/api_exec_es2.c \
+program/program_parse.tab.c \
+program/program_parse.tab.h \
+program/lex.yy.c
+
 main/api_exec_es1_dispatch.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_dispatch_deps)
 $(call glapi_gen_dispatch,$<,es1)
 
< at >< at > -243,6 +254,7 < at >< at > clean: clean-dricore
 -rm -f depend depend.bak libmesa.a libmesagallium.a
 -rm -f drivers/*/*.o
 -rm -f *.pc
+-rm -f $(BUILT_SOURCES)
 -< at >cd drivers/dri && $(MAKE) clean
 -< at >cd drivers/x11 && $(MAKE) clean
 -< at >cd drivers/osmesa && $(MAKE) clean

[PATCH 7/8] automake: Convert dricore building to automake.

Eric Anholt — 2012-05-24T23:45:11

This is performed in a subdirectory to avoid needing to convert all of
src/mesa/Makefile in one go.

I can now cherry-pick a commit containing glapi XML changes, do "(cd
src/mapi/glapi/gen && make) && make", and get a working driver.
---
 configure.ac                    |   12 ++++++
 src/mesa/Makefile               |   54 ++++++--------------------
 src/mesa/libdricore/.gitignore  |    2 +
 src/mesa/libdricore/Makefile.am |   79 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 105 insertions(+), 42 deletions(-)
 create mode 100644 src/mesa/libdricore/.gitignore
 create mode 100644 src/mesa/libdricore/Makefile.am

diff --git a/configure.ac b/configure.ac
index 30a1099..e4280a0 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -50,6 +50,7 < at >< at > AC_PROG_CPP
 AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
+AM_PROG_AS
 AC_CHECK_PROGS([MAKE], [gmake make])
 AC_CHECK_PROGS([PYTHON2], [python2 python])
 AC_PROG_SED
< at >< at > -1087,7 +1088,9 < at >< at > if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then
     DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
     DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
     MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
+    HAVE_DRICORE=yes
 fi
+AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
 AC_SUBST([DRICORE_LIBS])
 AC_SUBST([DRICORE_GLSL_LIBS])
 AC_SUBST([DRICORE_LIB_DEPS])
< at >< at > -2074,6 +2077,14 < at >< at > AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes)
 AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes)
 AC_SUBST([GALLIUM_MAKE_DIRS])
 
+AM_CONDITIONAL(HAVE_X11_DRIVER, echo "DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1)
+AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1)
+AM_CONDITIONAL(HAVE_OSMESA_DRIVER, echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1)
+
+AM_CONDITIONAL(HAVE_X86_ASM, echo "ASM_FLAGS" | grep 'X86_ASM' >/dev/null 2>&1)
+AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$ASM_FLAGS" | grep 'X86_64_ASM' >/dev/null 2>&1)
+AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$ASM_FLAGS" | grep 'SPARC_ASM' >/dev/null 2>&1)
+
 dnl prepend CORE_DIRS to SRC_DIRS
 SRC_DIRS="$CORE_DIRS $SRC_DIRS"
 
< at >< at > -2108,6 +2119,7 < at >< at > AC_CONFIG_FILES([configs/autoconf
 src/glx/Makefile
 src/mapi/shared-glapi/Makefile
 src/gtest/Makefile
+src/mesa/libdricore/Makefile
 src/mesa/drivers/dri/dri.pc
 src/mesa/drivers/dri/Makefile
 src/mesa/drivers/dri/common/Makefile
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 2d5b727..dab1c37 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
< at >< at > -7,13 +7,11 < at >< at > MESA_LIBS := libmesa.a libmesagallium.a
 DEPENDS := depend
 
 MESA_OBJ_DIR := .
-DRICORE_OBJ_DIR := objs-dricore
 
 SRCDIR = .
 include sources.mak
 
 # adjust object dirs
-DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))
 MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
 MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
 
< at >< at > -23,18 +21,13 < at >< at > MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
 # append include dirs
 MESA_CPPFLAGS += $(INCLUDE_DIRS)
 
-DRICORE_CPPFLAGS = $(MESA_CPPFLAGS)
-
 # tidy compiler flags
 CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))
 CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
 
 # LLVM is needed for the state tracker
 MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)
-DRICORE_CFLAGS := $(LLVM_CFLAGS) $(DRI_CFLAGS)
-
 MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)
-DRICORE_CXXFLAGS := $(LLVM_CFLAGS) $(DRI_CXXFLAGS)
 
 define mesa-cc-c
 < at >mkdir -p $(dir $< at >)
< at >< at > -55,18 +48,9 < at >< at > $(MESA_OBJ_DIR)/%.o: %.cpp
 $(MESA_OBJ_DIR)/%.o: %.S
 $(call mesa-cc-c,MESA)
 
-$(DRICORE_OBJ_DIR)/%.o: %.c
-$(call mesa-cc-c,DRICORE)
-
-$(DRICORE_OBJ_DIR)/%.o: %.cpp
-$(call mesa-cxx-c,DRICORE)
-
-$(DRICORE_OBJ_DIR)/%.o: %.S
-$(call mesa-cc-c,DRICORE)
-
 # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
 # then convenience libs (.a) and finally the device drivers:
-default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
+default: $(DEPENDS) asm_subdirs $(MESA_LIBS) driver_subdirs
 
 # include glapi_gen.mk for generating glapi headers for GLES
 GLAPI := $(TOP)/src/mapi/glapi/gen
< at >< at > -111,6 +95,11 < at >< at > program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
 program/lex.yy.c: program/program_lexer.l
 $(FLEX) --never-interactive --outfile=$< at > $<
 
+ifneq (,$(DRICORE_LIBS))
+DRICORE_TARGET = dricore
+DRICORE_INSTALL_TARGET = install-dricore
+endif
+
 ######################################################################
 # Helper libraries used by many drivers:
 
< at >< at > -118,20 +107,16 < at >< at > program/lex.yy.c: program/program_lexer.l
 libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)
 < at > $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)
 
-# Shared dricore library for classic DRI drivers
-$(TOP)/$(LIB_DIR)/libdricore.so: $(DRICORE_OBJECTS) $(DRICORE_GLSL_LIBS)
-< at >$(MKLIB) -o $< at > -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
--cplusplus -noprefix \
--install $(TOP)/$(LIB_DIR) -id $(DRI_DRIVER_INSTALL_DIR)/$< at >.dylib \
-$(DRICORE_LIB_DEPS) $(DRICORE_OBJECTS)
-
 # Make archive of subset of core mesa object files for gallium
 libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
 < at > $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
 
+dricore: $(BUILT_SOURCES)
+< at > (cd libdricore && $(MAKE))
+
 ######################################################################
 # Device drivers
-driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)
+driver_subdirs: $(MESA_LIBS) $(DRICORE_TARGET)
 < at > (cd drivers && $(MAKE))
 
 
< at >< at > -146,7 +131,6 < at >< at > asm_subdirs:
 (cd x86-64 && $(MAKE)) || exit 1 ; \
 fi
 
-
 ######################################################################
 # Dependency generation
 
< at >< at > -155,8 +139,6 < at >< at > depend: $(ALL_FILES)
 < at > touch depend
 < at >$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
 $(ALL_FILES) > /dev/null 2>/dev/null
-< at >$(MKDEP) $(MKDEP_OPTIONS) -a -p$(DRICORE_OBJ_DIR)/ $(MESA_CPPFLAGS) \
-$(ALL_FILES) > /dev/null 2>/dev/null
 
 ######################################################################
 # Installation rules
< at >< at > -165,10 +147,6 < at >< at > depend: $(ALL_FILES)
 new_install:
 (cd drivers && $(MAKE) install)
 
-ifneq (,$(DRICORE_LIBS))
-DRICORE_INSTALL_TARGET = install-dricore
-endif
-
 # XXX replace this with new_install above someday
 install: default $(DRICORE_INSTALL_TARGET)
 < at >for driver in $(DRIVER_DIRS) ; do \
< at >< at > -234,22 +212,14 < at >< at > install-osmesa: default osmesa.pc
 install-dri: default
 cd drivers/dri && $(MAKE) install
 
-# We don't need MINSTALL here because we're not installing symbolic links
 install-dricore: default
-$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-$(INSTALL) -m 755 $(DRICORE_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-
+< at > (cd libdricore && $(MAKE) install)
 
 # Emacs tags
 tags:
 etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
 
-clean-dricore:
--rm -f libdricore.so
--rm -f $(DRICORE_LIBS)
--rm -rf $(DRICORE_OBJ_DIR)
-
-clean: clean-dricore
+clean:
 -rm -f */*.o
 -rm -f */*/*.o
 -rm -f depend depend.bak libmesa.a libmesagallium.a
diff --git a/src/mesa/libdricore/.gitignore b/src/mesa/libdricore/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/src/mesa/libdricore/.gitignore
< at >< at > -0,0 +1,2 < at >< at >
+Makefile
+Makefile.in
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
new file mode 100644
index 0000000..6fc4bbe
--- /dev/null
+++ b/src/mesa/libdricore/Makefile.am
< at >< at > -0,0 +1,79 < at >< at >
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+TOP=$(top_srcdir)
+SRCDIR = $(srcdir)/..
+include ../sources.mak
+
+noinst_PROGRAMS =
+
+AM_CPPFLAGS = \
+$(INCLUDE_DIRS) \
+$(API_DEFINES) \
+$(DEFINES)
+
+dridir = $(libdir)/dri
+
+AM_CFLAGS = $(CFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
+AM_CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
+AM_CCASFLAGS = $(CFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
+
+libdricore_la_SOURCES = \
+$(MESA_FILES) \
+$(MESA_CXX_FILES)
+libdricore_la_LDFLAGS = -module -avoid-version -shared
+libdricore_la_LIBADD = libdricore-asm.la
+
+# This is separated from libdricore to avoid conflics in object
+# outputs between main/clip.c and sparc/clip.c.  The documented way to
+# do this is with the automake option subdir-objects, except that
+# option is broken in the presence of variable expansion in *_SOURCES.
+# I have no idea how that option is supposed to be usable as is.
+libdricore_asm_la_SOURCES =
+libdricore_asm_la_CCASFLAGS = $(AM_CCASFLAGS) -DWORKAROUND_AUTOMAKE_OBJ_FILE_CONFLICTS
+
+if HAVE_X86_ASM
+libdricore_asm_la_SOURCES += $(X86_FILES)
+endif
+
+if HAVE_X86_64_ASM
+libdricore_asm_la_SOURCES += $(X86_64_FILES)
+endif
+
+if HAVE_SPARC_ASM
+libdricore_asm_la_SOURCES += $(SPARC_FILES)
+endif
+
+if HAVE_DRICORE
+noinst_LTLIBRARIES = libdricore-asm.la
+dri_LTLIBRARIES = libdricore.la
+
+# Provide compatibility with scripts for the old Mesa build system for
+# a while by putting a link to the driver into /lib of the build tree.
+all-local: libdricore.la
+$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+ln -f .libs/libdricore.so $(top_builddir)/$(LIB_DIR)/libdricore.so;
+endif
+
+CLEANFILES = \
+$(top_builddir)/$(LIB_DIR)/libdricore.so
+
+-include $(DEPENDS)

[PATCH 5/8] automake: Rename variables in sources.mak tobe automake compatible.

Eric Anholt — 2012-05-24T23:45:09

*_SOURCES is reserved for files lists for particular automake targets.
 Also, "-" in the variable names is not allowed.
---
 configs/autoconf.in  |    2 +-
 configs/default      |    2 +-
 configure.ac         |   10 ++---
 src/mesa/Android.mk  |   20 +++++-----
 src/mesa/Makefile    |    6 +--
 src/mesa/sources.mak |  108 +++++++++++++++++++++++++-------------------------
 6 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 3c8f4c1..38f49a2 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
< at >< at > -47,7 +47,7 < at >< at > DRI_CXXFLAGS = < at >DRI_CXXFLAGS< at >
 DLOPEN_LIBS = < at >DLOPEN_LIBS< at >
 
 # Source selection
-MESA_ASM_SOURCES = < at >MESA_ASM_SOURCES< at >
+MESA_ASM_FILES = < at >MESA_ASM_FILES< at >
 GLAPI_ASM_SOURCES = < at >GLAPI_ASM_SOURCES< at >
 
 # Misc tools and flags
diff --git a/configs/default b/configs/default
index 40fa5e3..0f8b09f 100644
--- a/configs/default
+++ b/configs/default
< at >< at > -89,7 +89,7 < at >< at > DRI_CFLAGS = $(CFLAGS)
 DRI_CXXFLAGS = $(CXXFLAGS)
 
 # Optional assembly language optimization files for libGL
-MESA_ASM_SOURCES = 
+MESA_ASM_FILES =
 
 # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
 # order to build the Motif widget too)
diff --git a/configure.ac b/configure.ac
index 5ccf77d..30a1099 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -436,7 +436,7 < at >< at > AC_ARG_ENABLE([asm],
 )
 asm_arch=""
 ASM_FLAGS=""
-MESA_ASM_SOURCES=""
+MESA_ASM_FILES=""
 GLAPI_ASM_SOURCES=""
 AC_MSG_CHECKING([whether to enable assembly])
 test "x$enable_asm" = xno && AC_MSG_RESULT([no])
< at >< at > -485,19 +485,19 < at >< at > if test "x$enable_asm" = xyes; then
     case "$asm_arch" in
     x86)
         ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"
-        MESA_ASM_SOURCES='$(X86_SOURCES)'
+        MESA_ASM_FILES='$(X86_FILES)'
         GLAPI_ASM_SOURCES='$(X86_API)'
         AC_MSG_RESULT([yes, x86])
         ;;
     x86_64)
         ASM_FLAGS="-DUSE_X86_64_ASM"
-        MESA_ASM_SOURCES='$(X86-64_SOURCES)'
+        MESA_ASM_FILES='$(X86_64_FILES)'
         GLAPI_ASM_SOURCES='$(X86-64_API)'
         AC_MSG_RESULT([yes, x86_64])
         ;;
     sparc)
         ASM_FLAGS="-DUSE_SPARC_ASM"
-        MESA_ASM_SOURCES='$(SPARC_SOURCES)'
+        MESA_ASM_FILES='$(SPARC_FILES)'
         GLAPI_ASM_SOURCES='$(SPARC_API)'
         AC_MSG_RESULT([yes, sparc])
         ;;
< at >< at > -507,7 +507,7 < at >< at > if test "x$enable_asm" = xyes; then
     esac
 fi
 AC_SUBST([ASM_FLAGS])
-AC_SUBST([MESA_ASM_SOURCES])
+AC_SUBST([MESA_ASM_FILES])
 AC_SUBST([GLAPI_ASM_SOURCES])
 
 dnl PIC code macro
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index f6c0f4e..4b62b81 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
< at >< at > -26,11 +26,11 < at >< at >
 LOCAL_PATH := $(call my-dir)
 
 # Import the following variables:
-#     MESA_CXX_SOURCES
-#     MESA_GALLIUM_CXX_SOURCES
-#     MESA_GALLIUM_SOURCES
-#     MESA_SOURCES
-#     X86_SOURCES
+#     MESA_CXX_FILES
+#     MESA_GALLIUM_CXX_FILES
+#     MESA_GALLIUM_FILES
+#     MESA_FILES
+#     X86_FILES
 include $(LOCAL_PATH)/sources.mak
 
 common_CFLAGS := \
< at >< at > -49,7 +49,7 < at >< at > common_ASM :=
 
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
-common_ASM += $(X86_SOURCES)
+common_ASM += $(X86_FILES)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := x86/gen_matypes.c
< at >< at > -71,8 +71,8 < at >< at > ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-$(MESA_GALLIUM_SOURCES) \
-$(MESA_GALLIUM_CXX_SOURCES) \
+$(MESA_GALLIUM_FILES) \
+$(MESA_GALLIUM_CXX_FILES) \
 $(common_ASM)
 
 LOCAL_CFLAGS := $(common_CFLAGS)
< at >< at > -108,8 +108,8 < at >< at > LOCAL_C_INCLUDES := \
 $(common_C_INCLUDES)
 
 LOCAL_SRC_FILES := \
-        $(MESA_SOURCES) \
-        $(MESA_CXX_SOURCES) \
+        $(MESA_FILES) \
+        $(MESA_CXX_FILES) \
         $(common_ASM)
 
 include $(LOCAL_PATH)/Android.gen.mk
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 4783f32..3906053 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
< at >< at > -149,13 +149,13 < at >< at > asm_subdirs:
 ######################################################################
 # Dependency generation
 
-depend: $(ALL_SOURCES)
+depend: $(ALL_FILES)
 < at > echo "running $(MKDEP)"
 < at > touch depend
 < at >$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
-$(ALL_SOURCES) > /dev/null 2>/dev/null
+$(ALL_FILES) > /dev/null 2>/dev/null
 < at >$(MKDEP) $(MKDEP_OPTIONS) -a -p$(DRICORE_OBJ_DIR)/ $(MESA_CPPFLAGS) \
-$(ALL_SOURCES) > /dev/null 2>/dev/null
+$(ALL_FILES) > /dev/null 2>/dev/null
 
 ######################################################################
 # Installation rules
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 19a05ec..7b19bbc 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
< at >< at > -1,11 +1,11 < at >< at >
 ### Lists of source files, included by Makefiles
 
-# this is part of MAIN_SOURCES
-MAIN_ES_SOURCES = \
+# this is part of MAIN_FILES
+MAIN_ES_FILES = \
 main/api_exec_es1.c \
 main/api_exec_es2.c
 
-MAIN_SOURCES = \
+MAIN_FILES = \
 main/api_arrayelt.c \
 main/api_exec.c \
 main/api_loopback.c \
< at >< at > -103,14 +103,14 < at >< at > MAIN_SOURCES = \
 main/version.c \
 main/viewport.c \
 main/vtxfmt.c \
-$(MAIN_ES_SOURCES)
+$(MAIN_ES_FILES)
 
-MAIN_CXX_SOURCES = \
+MAIN_CXX_FILES = \
 main/ff_fragment_shader.cpp \
 main/shader_query.cpp \
 main/uniform_query.cpp
 
-MATH_SOURCES = \
+MATH_FILES = \
 math/m_debug_clip.c \
 math/m_debug_norm.c \
 math/m_debug_xform.c \
< at >< at > -119,10 +119,10 < at >< at > MATH_SOURCES = \
 math/m_translate.c \
 math/m_vector.c
 
-MATH_XFORM_SOURCES = \
+MATH_XFORM_FILES = \
 math/m_xform.c
 
-SWRAST_SOURCES = \
+SWRAST_FILES = \
 swrast/s_aaline.c \
 swrast/s_aatriangle.c \
 swrast/s_alpha.c \
< at >< at > -153,11 +153,11 < at >< at > SWRAST_SOURCES = \
 swrast/s_triangle.c \
 swrast/s_zoom.c
 
-SWRAST_SETUP_SOURCES = \
+SWRAST_SETUP_FILES = \
 swrast_setup/ss_context.c \
 swrast_setup/ss_triangle.c 
 
-TNL_SOURCES = \
+TNL_FILES = \
 tnl/t_context.c \
 tnl/t_pipeline.c \
 tnl/t_draw.c \
< at >< at > -176,7 +176,7 < at >< at > TNL_SOURCES = \
 tnl/t_vertex_sse.c \
 tnl/t_vertex_generic.c 
 
-VBO_SOURCES = \
+VBO_FILES = \
 vbo/vbo_context.c \
 vbo/vbo_exec.c \
 vbo/vbo_exec_api.c \
< at >< at > -194,7 +194,7 < at >< at > VBO_SOURCES = \
 vbo/vbo_save_draw.c \
 vbo/vbo_save_loopback.c 
 
-STATETRACKER_SOURCES = \
+STATETRACKER_FILES = \
 state_tracker/st_atom.c \
 state_tracker/st_atom_blend.c \
 state_tracker/st_atom_clip.c \
< at >< at > -243,7 +243,7 < at >< at > STATETRACKER_SOURCES = \
 state_tracker/st_program.c \
 state_tracker/st_texture.c
 
-PROGRAM_SOURCES = \
+PROGRAM_FILES = \
 program/arbprogparse.c \
 program/hash_table.c \
 program/lex.yy.c \
< at >< at > -267,12 +267,12 < at >< at > PROGRAM_SOURCES = \
 program/symbol_table.c
 
 
-SHADER_CXX_SOURCES = \
+SHADER_CXX_FILES = \
 program/ir_to_mesa.cpp \
 program/sampler.cpp \
 program/string_to_uint_map.cpp
 
-ASM_C_SOURCES =\
+ASM_C_FILES =\
 x86/common_x86.c \
 x86/x86_xform.c \
 x86/3dnow.c \
< at >< at > -281,7 +281,7 < at >< at > ASM_C_SOURCES =\
 sparc/sparc.c \
 x86-64/x86-64.c
 
-X86_SOURCES =\
+X86_FILES =\
 x86/common_x86_asm.S\
 x86/x86_xform2.S\
 x86/x86_xform3.S\
< at >< at > -300,71 +300,71 < at >< at > X86_SOURCES =\
 x86/sse_normal.S\
 x86/read_rgba_span_x86.S
 
-X86-64_SOURCES =\
+X86_64_FILES =\
 x86-64/xform4.S
 
-SPARC_SOURCES =\
+SPARC_FILES =\
 sparc/clip.S\
 sparc/norm.S\
 sparc/xform.S
 
-COMMON_DRIVER_SOURCES =\
+COMMON_DRIVER_FILES =\
 drivers/common/driverfuncs.c\
 drivers/common/meta.c
 
 
 # Sources for building non-Gallium drivers
-MESA_SOURCES = \
-$(MAIN_SOURCES)\
-$(MATH_SOURCES)\
-$(MATH_XFORM_SOURCES)\
-$(VBO_SOURCES)\
-$(TNL_SOURCES)\
-$(PROGRAM_SOURCES)\
-$(SWRAST_SOURCES)\
-$(SWRAST_SETUP_SOURCES)\
-$(COMMON_DRIVER_SOURCES)\
-$(ASM_C_SOURCES)
-
-MESA_CXX_SOURCES = \
-$(MAIN_CXX_SOURCES) \
-$(SHADER_CXX_SOURCES)
+MESA_FILES = \
+$(MAIN_FILES)\
+$(MATH_FILES)\
+$(MATH_XFORM_FILES)\
+$(VBO_FILES)\
+$(TNL_FILES)\
+$(PROGRAM_FILES)\
+$(SWRAST_FILES)\
+$(SWRAST_SETUP_FILES)\
+$(COMMON_DRIVER_FILES)\
+$(ASM_C_FILES)
+
+MESA_CXX_FILES = \
+$(MAIN_CXX_FILES) \
+$(SHADER_CXX_FILES)
 
 # Sources for building Gallium drivers
-MESA_GALLIUM_SOURCES = \
-$(MAIN_SOURCES)\
-$(MATH_SOURCES)\
-$(VBO_SOURCES)\
-$(STATETRACKER_SOURCES)\
-$(PROGRAM_SOURCES)\
+MESA_GALLIUM_FILES = \
+$(MAIN_FILES)\
+$(MATH_FILES)\
+$(VBO_FILES)\
+$(STATETRACKER_FILES)\
+$(PROGRAM_FILES)\
 x86/common_x86.c
 
-MESA_GALLIUM_CXX_SOURCES = \
-$(MESA_CXX_SOURCES) \
+MESA_GALLIUM_CXX_FILES = \
+$(MESA_CXX_FILES) \
 state_tracker/st_glsl_to_tgsi.cpp
 
 # All the core C sources, for dependency checking
-ALL_SOURCES = \
-$(MESA_SOURCES)\
-$(MESA_GALLIUM_CXX_SOURCES) \
-$(MESA_ASM_SOURCES)\
-$(STATETRACKER_SOURCES)
+ALL_FILES = \
+$(MESA_FILES)\
+$(MESA_GALLIUM_CXX_FILES) \
+$(MESA_ASM_FILES)\
+$(STATETRACKER_FILES)
 
 
 ### Object files
 
 MESA_OBJECTS = \
-$(MESA_SOURCES:.c=.o) \
-$(MESA_CXX_SOURCES:.cpp=.o) \
-$(MESA_ASM_SOURCES:.S=.o)
+$(MESA_FILES:.c=.o) \
+$(MESA_CXX_FILES:.cpp=.o) \
+$(MESA_ASM_FILES:.S=.o)
 
 MESA_GALLIUM_OBJECTS = \
-$(MESA_GALLIUM_SOURCES:.c=.o) \
-$(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \
-$(MESA_ASM_SOURCES:.S=.o)
+$(MESA_GALLIUM_FILES:.c=.o) \
+$(MESA_GALLIUM_CXX_FILES:.cpp=.o) \
+$(MESA_ASM_FILES:.S=.o)
 
 
-COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
+COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_FILES:.c=.o)
 
 
 ### Other archives/libraries

[PATCH 8/8] mesa: Clean up some dricore-related detritusin the old Makefile.

Eric Anholt — 2012-05-24T23:45:12

---
 src/mesa/Makefile |   30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index dab1c37..069527e 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
< at >< at > -6,15 +6,9 < at >< at > include $(TOP)/configs/current
 MESA_LIBS := libmesa.a libmesagallium.a
 DEPENDS := depend
 
-MESA_OBJ_DIR := .
-
 SRCDIR = .
 include sources.mak
 
-# adjust object dirs
-MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
-MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
-
 # define preprocessor flags
 MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
 
< at >< at > -29,24 +23,14 < at >< at > CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
 MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)
 MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)
 
-define mesa-cc-c
-< at >mkdir -p $(dir $< at >)
-$(CC) -c -o $< at > $< $($(1)_CPPFLAGS) $($(1)_CFLAGS)
-endef
-
-define mesa-cxx-c
-< at >mkdir -p $(dir $< at >)
-$(CXX) -c -o $< at > $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)
-endef
-
-$(MESA_OBJ_DIR)/%.o: %.c
-$(call mesa-cc-c,MESA)
+%.o: %.c
+$(CC) -c -o $< at > $< $(MESA_CPPFLAGS) $(MESA_CFLAGS)
 
-$(MESA_OBJ_DIR)/%.o: %.cpp
-$(call mesa-cxx-c,MESA)
+%.o: %.cpp
+$(CXX) -c -o $< at > $< $(MESA_CPPFLAGS) $(MESA_CXXFLAGS)
 
-$(MESA_OBJ_DIR)/%.o: %.S
-$(call mesa-cc-c,MESA)
+%.o: %.S
+$(CC) -c -o $< at > $< $(MESA_CPPFLAGS) $(MESA_CFLAGS)
 
 # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
 # then convenience libs (.a) and finally the device drivers:
< at >< at > -137,7 +121,7 < at >< at > asm_subdirs:
 depend: $(ALL_FILES)
 < at > echo "running $(MKDEP)"
 < at > touch depend
-< at >$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
+< at >$(MKDEP) $(MKDEP_OPTIONS) $(MESA_CPPFLAGS) \
 $(ALL_FILES) > /dev/null 2>/dev/null
 
 ######################################################################

[PATCH 6/8] automake: Add a prefix variable to thecommon sources lists.

Eric Anholt — 2012-05-24T23:45:10

In order to do the minimal change for libdricore conversion to
automake, I need to put its Makefile.am in a subdirectory.  Automake
gets whiny/broken if you use GNU make features like "addprefix" or
"$(FILES:%=../%)" to munge your *_SOURCES.  So, use a plain old
variable to be able to substitute in that "../"
---
 src/mesa/Android.mk  |    1 +
 src/mesa/Makefile    |    1 +
 src/mesa/sources.mak |  554 +++++++++++++++++++++++++-------------------------
 3 files changed, 279 insertions(+), 277 deletions(-)

diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index 4b62b81..115db47 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
< at >< at > -31,6 +31,7 < at >< at > LOCAL_PATH := $(call my-dir)
 #     MESA_GALLIUM_FILES
 #     MESA_FILES
 #     X86_FILES
+SRCDIR = .
 include $(LOCAL_PATH)/sources.mak
 
 common_CFLAGS := \
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 3906053..2d5b727 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
< at >< at > -9,6 +9,7 < at >< at > DEPENDS := depend
 MESA_OBJ_DIR := .
 DRICORE_OBJ_DIR := objs-dricore
 
+SRCDIR = .
 include sources.mak
 
 # adjust object dirs
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 7b19bbc..63fbf58 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
< at >< at > -2,315 +2,315 < at >< at >
 
 # this is part of MAIN_FILES
 MAIN_ES_FILES = \
-main/api_exec_es1.c \
-main/api_exec_es2.c
+$(SRCDIR)/main/api_exec_es1.c \
+$(SRCDIR)/main/api_exec_es2.c
 
 MAIN_FILES = \
-main/api_arrayelt.c \
-main/api_exec.c \
-main/api_loopback.c \
-main/api_validate.c \
-main/accum.c \
-main/arbprogram.c \
-main/atifragshader.c \
-main/attrib.c \
-main/arrayobj.c \
-main/blend.c \
-main/bufferobj.c \
-main/buffers.c \
-main/clear.c \
-main/clip.c \
-main/colortab.c \
-main/condrender.c \
-main/context.c \
-main/convolve.c \
-main/cpuinfo.c \
-main/debug.c \
-main/depth.c \
-main/dlist.c \
-main/dlopen.c \
-main/drawpix.c \
-main/drawtex.c \
-main/enable.c \
-main/enums.c \
-main/errors.c \
-main/eval.c \
-main/execmem.c \
-main/extensions.c \
-main/fbobject.c \
-main/feedback.c \
-main/ffvertex_prog.c \
-main/fog.c \
-main/formats.c \
-main/format_pack.c \
-main/format_unpack.c \
-main/framebuffer.c \
-main/get.c \
-main/getstring.c \
-main/hash.c \
-main/hint.c \
-main/histogram.c \
-main/image.c \
-main/imports.c \
-main/light.c \
-main/lines.c \
-main/matrix.c \
-main/mipmap.c \
-main/mm.c \
-main/multisample.c \
-main/nvprogram.c \
-main/pack.c \
-main/pbo.c \
-main/pixel.c \
-main/pixelstore.c \
-main/pixeltransfer.c \
-main/points.c \
-main/polygon.c \
-main/queryobj.c \
-main/querymatrix.c \
-main/rastpos.c \
-main/readpix.c \
-main/remap.c \
-main/renderbuffer.c \
-main/samplerobj.c \
-main/scissor.c \
-main/shaderapi.c \
-main/shaderobj.c \
-main/shared.c \
-main/state.c \
-main/stencil.c \
-main/syncobj.c \
-main/texcompress.c \
-main/texcompress_rgtc.c \
-main/texcompress_s3tc.c \
-main/texcompress_fxt1.c \
-main/texcompress_etc.c \
-main/texenv.c \
-main/texformat.c \
-main/texgen.c \
-main/texgetimage.c \
-main/teximage.c \
-main/texobj.c \
-main/texpal.c \
-main/texparam.c \
-main/texstate.c \
-main/texstorage.c \
-main/texstore.c \
-main/texturebarrier.c \
-main/transformfeedback.c \
-main/uniforms.c \
-main/varray.c \
-main/version.c \
-main/viewport.c \
-main/vtxfmt.c \
+$(SRCDIR)/main/api_arrayelt.c \
+$(SRCDIR)/main/api_exec.c \
+$(SRCDIR)/main/api_loopback.c \
+$(SRCDIR)/main/api_validate.c \
+$(SRCDIR)/main/accum.c \
+$(SRCDIR)/main/arbprogram.c \
+$(SRCDIR)/main/atifragshader.c \
+$(SRCDIR)/main/attrib.c \
+$(SRCDIR)/main/arrayobj.c \
+$(SRCDIR)/main/blend.c \
+$(SRCDIR)/main/bufferobj.c \
+$(SRCDIR)/main/buffers.c \
+$(SRCDIR)/main/clear.c \
+$(SRCDIR)/main/clip.c \
+$(SRCDIR)/main/colortab.c \
+$(SRCDIR)/main/condrender.c \
+$(SRCDIR)/main/context.c \
+$(SRCDIR)/main/convolve.c \
+$(SRCDIR)/main/cpuinfo.c \
+$(SRCDIR)/main/debug.c \
+$(SRCDIR)/main/depth.c \
+$(SRCDIR)/main/dlist.c \
+$(SRCDIR)/main/dlopen.c \
+$(SRCDIR)/main/drawpix.c \
+$(SRCDIR)/main/drawtex.c \
+$(SRCDIR)/main/enable.c \
+$(SRCDIR)/main/enums.c \
+$(SRCDIR)/main/errors.c \
+$(SRCDIR)/main/eval.c \
+$(SRCDIR)/main/execmem.c \
+$(SRCDIR)/main/extensions.c \
+$(SRCDIR)/main/fbobject.c \
+$(SRCDIR)/main/feedback.c \
+$(SRCDIR)/main/ffvertex_prog.c \
+$(SRCDIR)/main/fog.c \
+$(SRCDIR)/main/formats.c \
+$(SRCDIR)/main/format_pack.c \
+$(SRCDIR)/main/format_unpack.c \
+$(SRCDIR)/main/framebuffer.c \
+$(SRCDIR)/main/get.c \
+$(SRCDIR)/main/getstring.c \
+$(SRCDIR)/main/hash.c \
+$(SRCDIR)/main/hint.c \
+$(SRCDIR)/main/histogram.c \
+$(SRCDIR)/main/image.c \
+$(SRCDIR)/main/imports.c \
+$(SRCDIR)/main/light.c \
+$(SRCDIR)/main/lines.c \
+$(SRCDIR)/main/matrix.c \
+$(SRCDIR)/main/mipmap.c \
+$(SRCDIR)/main/mm.c \
+$(SRCDIR)/main/multisample.c \
+$(SRCDIR)/main/nvprogram.c \
+$(SRCDIR)/main/pack.c \
+$(SRCDIR)/main/pbo.c \
+$(SRCDIR)/main/pixel.c \
+$(SRCDIR)/main/pixelstore.c \
+$(SRCDIR)/main/pixeltransfer.c \
+$(SRCDIR)/main/points.c \
+$(SRCDIR)/main/polygon.c \
+$(SRCDIR)/main/queryobj.c \
+$(SRCDIR)/main/querymatrix.c \
+$(SRCDIR)/main/rastpos.c \
+$(SRCDIR)/main/readpix.c \
+$(SRCDIR)/main/remap.c \
+$(SRCDIR)/main/renderbuffer.c \
+$(SRCDIR)/main/samplerobj.c \
+$(SRCDIR)/main/scissor.c \
+$(SRCDIR)/main/shaderapi.c \
+$(SRCDIR)/main/shaderobj.c \
+$(SRCDIR)/main/shared.c \
+$(SRCDIR)/main/state.c \
+$(SRCDIR)/main/stencil.c \
+$(SRCDIR)/main/syncobj.c \
+$(SRCDIR)/main/texcompress.c \
+$(SRCDIR)/main/texcompress_rgtc.c \
+$(SRCDIR)/main/texcompress_s3tc.c \
+$(SRCDIR)/main/texcompress_fxt1.c \
+$(SRCDIR)/main/texcompress_etc.c \
+$(SRCDIR)/main/texenv.c \
+$(SRCDIR)/main/texformat.c \
+$(SRCDIR)/main/texgen.c \
+$(SRCDIR)/main/texgetimage.c \
+$(SRCDIR)/main/teximage.c \
+$(SRCDIR)/main/texobj.c \
+$(SRCDIR)/main/texpal.c \
+$(SRCDIR)/main/texparam.c \
+$(SRCDIR)/main/texstate.c \
+$(SRCDIR)/main/texstorage.c \
+$(SRCDIR)/main/texstore.c \
+$(SRCDIR)/main/texturebarrier.c \
+$(SRCDIR)/main/transformfeedback.c \
+$(SRCDIR)/main/uniforms.c \
+$(SRCDIR)/main/varray.c \
+$(SRCDIR)/main/version.c \
+$(SRCDIR)/main/viewport.c \
+$(SRCDIR)/main/vtxfmt.c \
 $(MAIN_ES_FILES)
 
 MAIN_CXX_FILES = \
-main/ff_fragment_shader.cpp \
-main/shader_query.cpp \
-main/uniform_query.cpp
+$(SRCDIR)/main/ff_fragment_shader.cpp \
+$(SRCDIR)/main/shader_query.cpp \
+$(SRCDIR)/main/uniform_query.cpp
 
 MATH_FILES = \
-math/m_debug_clip.c \
-math/m_debug_norm.c \
-math/m_debug_xform.c \
-math/m_eval.c \
-math/m_matrix.c \
-math/m_translate.c \
-math/m_vector.c
+$(SRCDIR)/math/m_debug_clip.c \
+$(SRCDIR)/math/m_debug_norm.c \
+$(SRCDIR)/math/m_debug_xform.c \
+$(SRCDIR)/math/m_eval.c \
+$(SRCDIR)/math/m_matrix.c \
+$(SRCDIR)/math/m_translate.c \
+$(SRCDIR)/math/m_vector.c
 
 MATH_XFORM_FILES = \
-math/m_xform.c
+$(SRCDIR)/math/m_xform.c
 
 SWRAST_FILES = \
-swrast/s_aaline.c \
-swrast/s_aatriangle.c \
-swrast/s_alpha.c \
-swrast/s_atifragshader.c \
-swrast/s_bitmap.c \
-swrast/s_blend.c \
-swrast/s_blit.c \
-swrast/s_clear.c \
-swrast/s_copypix.c \
-swrast/s_context.c \
-swrast/s_depth.c \
-swrast/s_drawpix.c \
-swrast/s_feedback.c \
-swrast/s_fog.c \
-swrast/s_fragprog.c \
-swrast/s_lines.c \
-swrast/s_logic.c \
-swrast/s_masking.c \
-swrast/s_points.c \
-swrast/s_renderbuffer.c \
-swrast/s_span.c \
-swrast/s_stencil.c \
-swrast/s_texcombine.c \
-swrast/s_texfetch.c \
-swrast/s_texfilter.c \
-swrast/s_texrender.c \
-swrast/s_texture.c \
-swrast/s_triangle.c \
-swrast/s_zoom.c
+$(SRCDIR)/swrast/s_aaline.c \
+$(SRCDIR)/swrast/s_aatriangle.c \
+$(SRCDIR)/swrast/s_alpha.c \
+$(SRCDIR)/swrast/s_atifragshader.c \
+$(SRCDIR)/swrast/s_bitmap.c \
+$(SRCDIR)/swrast/s_blend.c \
+$(SRCDIR)/swrast/s_blit.c \
+$(SRCDIR)/swrast/s_clear.c \
+$(SRCDIR)/swrast/s_copypix.c \
+$(SRCDIR)/swrast/s_context.c \
+$(SRCDIR)/swrast/s_depth.c \
+$(SRCDIR)/swrast/s_drawpix.c \
+$(SRCDIR)/swrast/s_feedback.c \
+$(SRCDIR)/swrast/s_fog.c \
+$(SRCDIR)/swrast/s_fragprog.c \
+$(SRCDIR)/swrast/s_lines.c \
+$(SRCDIR)/swrast/s_logic.c \
+$(SRCDIR)/swrast/s_masking.c \
+$(SRCDIR)/swrast/s_points.c \
+$(SRCDIR)/swrast/s_renderbuffer.c \
+$(SRCDIR)/swrast/s_span.c \
+$(SRCDIR)/swrast/s_stencil.c \
+$(SRCDIR)/swrast/s_texcombine.c \
+$(SRCDIR)/swrast/s_texfetch.c \
+$(SRCDIR)/swrast/s_texfilter.c \
+$(SRCDIR)/swrast/s_texrender.c \
+$(SRCDIR)/swrast/s_texture.c \
+$(SRCDIR)/swrast/s_triangle.c \
+$(SRCDIR)/swrast/s_zoom.c
 
 SWRAST_SETUP_FILES = \
-swrast_setup/ss_context.c \
-swrast_setup/ss_triangle.c 
+$(SRCDIR)/swrast_setup/ss_context.c \
+$(SRCDIR)/swrast_setup/ss_triangle.c
 
 TNL_FILES = \
-tnl/t_context.c \
-tnl/t_pipeline.c \
-tnl/t_draw.c \
-tnl/t_rasterpos.c \
-tnl/t_vb_program.c \
-tnl/t_vb_render.c \
-tnl/t_vb_texgen.c \
-tnl/t_vb_texmat.c \
-tnl/t_vb_vertex.c \
-tnl/t_vb_fog.c \
-tnl/t_vb_light.c \
-tnl/t_vb_normals.c \
-tnl/t_vb_points.c \
-tnl/t_vp_build.c \
-tnl/t_vertex.c \
-tnl/t_vertex_sse.c \
-tnl/t_vertex_generic.c 
+$(SRCDIR)/tnl/t_context.c \
+$(SRCDIR)/tnl/t_pipeline.c \
+$(SRCDIR)/tnl/t_draw.c \
+$(SRCDIR)/tnl/t_rasterpos.c \
+$(SRCDIR)/tnl/t_vb_program.c \
+$(SRCDIR)/tnl/t_vb_render.c \
+$(SRCDIR)/tnl/t_vb_texgen.c \
+$(SRCDIR)/tnl/t_vb_texmat.c \
+$(SRCDIR)/tnl/t_vb_vertex.c \
+$(SRCDIR)/tnl/t_vb_fog.c \
+$(SRCDIR)/tnl/t_vb_light.c \
+$(SRCDIR)/tnl/t_vb_normals.c \
+$(SRCDIR)/tnl/t_vb_points.c \
+$(SRCDIR)/tnl/t_vp_build.c \
+$(SRCDIR)/tnl/t_vertex.c \
+$(SRCDIR)/tnl/t_vertex_sse.c \
+$(SRCDIR)/tnl/t_vertex_generic.c
 
 VBO_FILES = \
-vbo/vbo_context.c \
-vbo/vbo_exec.c \
-vbo/vbo_exec_api.c \
-vbo/vbo_exec_array.c \
-vbo/vbo_exec_draw.c \
-vbo/vbo_exec_eval.c \
-vbo/vbo_noop.c \
-vbo/vbo_primitive_restart.c \
-vbo/vbo_rebase.c \
-vbo/vbo_split.c \
-vbo/vbo_split_copy.c \
-vbo/vbo_split_inplace.c \
-vbo/vbo_save.c \
-vbo/vbo_save_api.c \
-vbo/vbo_save_draw.c \
-vbo/vbo_save_loopback.c 
+$(SRCDIR)/vbo/vbo_context.c \
+$(SRCDIR)/vbo/vbo_exec.c \
+$(SRCDIR)/vbo/vbo_exec_api.c \
+$(SRCDIR)/vbo/vbo_exec_array.c \
+$(SRCDIR)/vbo/vbo_exec_draw.c \
+$(SRCDIR)/vbo/vbo_exec_eval.c \
+$(SRCDIR)/vbo/vbo_noop.c \
+$(SRCDIR)/vbo/vbo_primitive_restart.c \
+$(SRCDIR)/vbo/vbo_rebase.c \
+$(SRCDIR)/vbo/vbo_split.c \
+$(SRCDIR)/vbo/vbo_split_copy.c \
+$(SRCDIR)/vbo/vbo_split_inplace.c \
+$(SRCDIR)/vbo/vbo_save.c \
+$(SRCDIR)/vbo/vbo_save_api.c \
+$(SRCDIR)/vbo/vbo_save_draw.c \
+$(SRCDIR)/vbo/vbo_save_loopback.c
 
 STATETRACKER_FILES = \
-state_tracker/st_atom.c \
-state_tracker/st_atom_blend.c \
-state_tracker/st_atom_clip.c \
-state_tracker/st_atom_constbuf.c \
-state_tracker/st_atom_depth.c \
-state_tracker/st_atom_framebuffer.c \
-state_tracker/st_atom_msaa.c \
-state_tracker/st_atom_pixeltransfer.c \
-state_tracker/st_atom_sampler.c \
-state_tracker/st_atom_scissor.c \
-state_tracker/st_atom_shader.c \
-state_tracker/st_atom_rasterizer.c \
-state_tracker/st_atom_stipple.c \
-state_tracker/st_atom_texture.c \
-state_tracker/st_atom_viewport.c \
-state_tracker/st_cb_bitmap.c \
-state_tracker/st_cb_blit.c \
-state_tracker/st_cb_bufferobjects.c \
-state_tracker/st_cb_clear.c \
-state_tracker/st_cb_condrender.c \
-state_tracker/st_cb_flush.c \
-state_tracker/st_cb_drawpixels.c \
-state_tracker/st_cb_drawtex.c \
-state_tracker/st_cb_eglimage.c \
-state_tracker/st_cb_fbo.c \
-state_tracker/st_cb_feedback.c \
-state_tracker/st_cb_program.c \
-state_tracker/st_cb_queryobj.c \
-state_tracker/st_cb_rasterpos.c \
-state_tracker/st_cb_readpixels.c \
-state_tracker/st_cb_syncobj.c \
-state_tracker/st_cb_strings.c \
-state_tracker/st_cb_texture.c \
-state_tracker/st_cb_texturebarrier.c \
-state_tracker/st_cb_viewport.c \
-state_tracker/st_cb_xformfb.c \
-state_tracker/st_context.c \
-state_tracker/st_debug.c \
-state_tracker/st_draw.c \
-state_tracker/st_draw_feedback.c \
-state_tracker/st_extensions.c \
-state_tracker/st_format.c \
-state_tracker/st_gen_mipmap.c \
-state_tracker/st_manager.c \
-state_tracker/st_mesa_to_tgsi.c \
-state_tracker/st_program.c \
-state_tracker/st_texture.c
+$(SRCDIR)/state_tracker/st_atom.c \
+$(SRCDIR)/state_tracker/st_atom_blend.c \
+$(SRCDIR)/state_tracker/st_atom_clip.c \
+$(SRCDIR)/state_tracker/st_atom_constbuf.c \
+$(SRCDIR)/state_tracker/st_atom_depth.c \
+$(SRCDIR)/state_tracker/st_atom_framebuffer.c \
+$(SRCDIR)/state_tracker/st_atom_msaa.c \
+$(SRCDIR)/state_tracker/st_atom_pixeltransfer.c \
+$(SRCDIR)/state_tracker/st_atom_sampler.c \
+$(SRCDIR)/state_tracker/st_atom_scissor.c \
+$(SRCDIR)/state_tracker/st_atom_shader.c \
+$(SRCDIR)/state_tracker/st_atom_rasterizer.c \
+$(SRCDIR)/state_tracker/st_atom_stipple.c \
+$(SRCDIR)/state_tracker/st_atom_texture.c \
+$(SRCDIR)/state_tracker/st_atom_viewport.c \
+$(SRCDIR)/state_tracker/st_cb_bitmap.c \
+$(SRCDIR)/state_tracker/st_cb_blit.c \
+$(SRCDIR)/state_tracker/st_cb_bufferobjects.c \
+$(SRCDIR)/state_tracker/st_cb_clear.c \
+$(SRCDIR)/state_tracker/st_cb_condrender.c \
+$(SRCDIR)/state_tracker/st_cb_flush.c \
+$(SRCDIR)/state_tracker/st_cb_drawpixels.c \
+$(SRCDIR)/state_tracker/st_cb_drawtex.c \
+$(SRCDIR)/state_tracker/st_cb_eglimage.c \
+$(SRCDIR)/state_tracker/st_cb_fbo.c \
+$(SRCDIR)/state_tracker/st_cb_feedback.c \
+$(SRCDIR)/state_tracker/st_cb_program.c \
+$(SRCDIR)/state_tracker/st_cb_queryobj.c \
+$(SRCDIR)/state_tracker/st_cb_rasterpos.c \
+$(SRCDIR)/state_tracker/st_cb_readpixels.c \
+$(SRCDIR)/state_tracker/st_cb_syncobj.c \
+$(SRCDIR)/state_tracker/st_cb_strings.c \
+$(SRCDIR)/state_tracker/st_cb_texture.c \
+$(SRCDIR)/state_tracker/st_cb_texturebarrier.c \
+$(SRCDIR)/state_tracker/st_cb_viewport.c \
+$(SRCDIR)/state_tracker/st_cb_xformfb.c \
+$(SRCDIR)/state_tracker/st_context.c \
+$(SRCDIR)/state_tracker/st_debug.c \
+$(SRCDIR)/state_tracker/st_draw.c \
+$(SRCDIR)/state_tracker/st_draw_feedback.c \
+$(SRCDIR)/state_tracker/st_extensions.c \
+$(SRCDIR)/state_tracker/st_format.c \
+$(SRCDIR)/state_tracker/st_gen_mipmap.c \
+$(SRCDIR)/state_tracker/st_manager.c \
+$(SRCDIR)/state_tracker/st_mesa_to_tgsi.c \
+$(SRCDIR)/state_tracker/st_program.c \
+$(SRCDIR)/state_tracker/st_texture.c
 
 PROGRAM_FILES = \
-program/arbprogparse.c \
-program/hash_table.c \
-program/lex.yy.c \
-program/nvfragparse.c \
-program/nvvertparse.c \
-program/program.c \
-program/program_parse.tab.c \
-program/program_parse_extra.c \
-program/prog_cache.c \
-program/prog_execute.c \
-program/prog_instruction.c \
-program/prog_noise.c \
-program/prog_optimize.c \
-program/prog_opt_constant_fold.c \
-program/prog_parameter.c \
-program/prog_parameter_layout.c \
-program/prog_print.c \
-program/prog_statevars.c \
-program/programopt.c \
-program/register_allocate.c \
-program/symbol_table.c
+$(SRCDIR)/program/arbprogparse.c \
+$(SRCDIR)/program/hash_table.c \
+$(SRCDIR)/program/lex.yy.c \
+$(SRCDIR)/program/nvfragparse.c \
+$(SRCDIR)/program/nvvertparse.c \
+$(SRCDIR)/program/program.c \
+$(SRCDIR)/program/program_parse.tab.c \
+$(SRCDIR)/program/program_parse_extra.c \
+$(SRCDIR)/program/prog_cache.c \
+$(SRCDIR)/program/prog_execute.c \
+$(SRCDIR)/program/prog_instruction.c \
+$(SRCDIR)/program/prog_noise.c \
+$(SRCDIR)/program/prog_optimize.c \
+$(SRCDIR)/program/prog_opt_constant_fold.c \
+$(SRCDIR)/program/prog_parameter.c \
+$(SRCDIR)/program/prog_parameter_layout.c \
+$(SRCDIR)/program/prog_print.c \
+$(SRCDIR)/program/prog_statevars.c \
+$(SRCDIR)/program/programopt.c \
+$(SRCDIR)/program/register_allocate.c \
+$(SRCDIR)/program/symbol_table.c
 
 
 SHADER_CXX_FILES = \
-program/ir_to_mesa.cpp \
-program/sampler.cpp \
-program/string_to_uint_map.cpp
+$(SRCDIR)/program/ir_to_mesa.cpp \
+$(SRCDIR)/program/sampler.cpp \
+$(SRCDIR)/program/string_to_uint_map.cpp
 
 ASM_C_FILES =\
-x86/common_x86.c \
-x86/x86_xform.c \
-x86/3dnow.c \
-x86/sse.c \
-x86/rtasm/x86sse.c \
-sparc/sparc.c \
-x86-64/x86-64.c
+$(SRCDIR)/x86/common_x86.c \
+$(SRCDIR)/x86/x86_xform.c \
+$(SRCDIR)/x86/3dnow.c \
+$(SRCDIR)/x86/sse.c \
+$(SRCDIR)/x86/rtasm/x86sse.c \
+$(SRCDIR)/sparc/sparc.c \
+$(SRCDIR)/x86-64/x86-64.c
 
 X86_FILES =\
-x86/common_x86_asm.S\
-x86/x86_xform2.S\
-x86/x86_xform3.S\
-x86/x86_xform4.S\
-x86/x86_cliptest.S\
-x86/mmx_blend.S\
-x86/3dnow_xform1.S\
-x86/3dnow_xform2.S\
-x86/3dnow_xform3.S\
-x86/3dnow_xform4.S\
-x86/3dnow_normal.S\
-x86/sse_xform1.S\
-x86/sse_xform2.S\
-x86/sse_xform3.S\
-x86/sse_xform4.S\
-x86/sse_normal.S\
-x86/read_rgba_span_x86.S
+$(SRCDIR)/x86/common_x86_asm.S\
+$(SRCDIR)/x86/x86_xform2.S\
+$(SRCDIR)/x86/x86_xform3.S\
+$(SRCDIR)/x86/x86_xform4.S\
+$(SRCDIR)/x86/x86_cliptest.S\
+$(SRCDIR)/x86/mmx_blend.S\
+$(SRCDIR)/x86/3dnow_xform1.S\
+$(SRCDIR)/x86/3dnow_xform2.S\
+$(SRCDIR)/x86/3dnow_xform3.S\
+$(SRCDIR)/x86/3dnow_xform4.S\
+$(SRCDIR)/x86/3dnow_normal.S\
+$(SRCDIR)/x86/sse_xform1.S\
+$(SRCDIR)/x86/sse_xform2.S\
+$(SRCDIR)/x86/sse_xform3.S\
+$(SRCDIR)/x86/sse_xform4.S\
+$(SRCDIR)/x86/sse_normal.S\
+$(SRCDIR)/x86/read_rgba_span_x86.S
 
 X86_64_FILES =\
-x86-64/xform4.S
+$(SRCDIR)/x86-64/xform4.S
 
 SPARC_FILES =\
-sparc/clip.S\
-sparc/norm.S\
-sparc/xform.S
+$(SRCDIR)/sparc/clip.S\
+$(SRCDIR)/sparc/norm.S\
+$(SRCDIR)/sparc/xform.S
 
 COMMON_DRIVER_FILES =\
-drivers/common/driverfuncs.c\
-drivers/common/meta.c
+$(SRCDIR)/drivers/common/driverfuncs.c\
+$(SRCDIR)/drivers/common/meta.c
 
 
 # Sources for building non-Gallium drivers
< at >< at > -337,11 +337,11 < at >< at > MESA_GALLIUM_FILES = \
 $(VBO_FILES)\
 $(STATETRACKER_FILES)\
 $(PROGRAM_FILES)\
-x86/common_x86.c
+$(SRCDIR)/x86/common_x86.c
 
 MESA_GALLIUM_CXX_FILES = \
 $(MESA_CXX_FILES) \
-state_tracker/st_glsl_to_tgsi.cpp
+$(SRCDIR)/state_tracker/st_glsl_to_tgsi.cpp
 
 # All the core C sources, for dependency checking
 ALL_FILES = \

[PATCH 1/8] mesa: Restore installing of libGL fornon-dri builds.

Eric Anholt — 2012-05-24T23:45:05

Reported-by: Sven Joachim <svenjoac< at >gmx.de>
---
 src/mesa/Makefile |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 71e22b9..bb7b13a 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
< at >< at > -166,8 +166,8 < at >< at > install: default $(DRICORE_INSTALL_TARGET)
             else \
               $(MAKE) install-osmesa || exit 1 ; \
             fi ;; \
-    dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \
-    *)      $(MAKE) install-libgl || exit 1 ;; \
+    dri)    $(MAKE) install-libgl-pc install-dri || exit 1 ;; \
+    *)      $(MAKE) install-libgl-pc install-libgl || exit 1 ;; \
   esac ; \
 done
 
< at >< at > -203,7 +203,11 < at >< at > install-headers:
 $(INSTALL) -m 644 $(TOP)/include/GL/*.h \
 $(DESTDIR)$(INSTALL_INC_DIR)/GL
 
-install-libgl: default gl.pc install-headers
+install-libgl: default
+$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
+$(DESTDIR)$(INSTALL_LIB_DIR)
+
+install-libgl-pc: gl.pc install-headers
 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

[PATCH 3/8] glapi: Enable silent rules for generationwhen used from automake.

Eric Anholt — 2012-05-24T23:45:07

This variable won't be set when called from non-automake makefiles,
but it cleans up shared-glapi's output.
---
 src/mapi/glapi/gen/glapi_gen.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mapi/glapi/gen/glapi_gen.mk b/src/mapi/glapi/gen/glapi_gen.mk
index c7fa7c0..1b05a40 100644
--- a/src/mapi/glapi/gen/glapi_gen.mk
+++ b/src/mapi/glapi/gen/glapi_gen.mk
< at >< at > -17,7 +17,7 < at >< at > glapi_gen_mapi_deps := \
 # $(2): name of the printer
 define glapi_gen_mapi
 < at >mkdir -p $(dir $< at >)
-$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_mapi_script) \
+$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_mapi_script) \
 --mode lib --printer $(2) $(1) > $< at >
 endef
 
< at >< at > -28,7 +28,7 < at >< at > glapi_gen_dispatch_deps := $(glapi_gen_common_deps)
 # $(2): empty, es1, or es2 for entry point filtering
 define glapi_gen_dispatch
 < at >mkdir -p $(dir $< at >)
-$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_dispatch_script) \
+$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_dispatch_script) \
 -f $(1) -m remap_table $(if $(2),-c $(2),) > $< at >
 endef
 
< at >< at > -39,6 +39,6 < at >< at > glapi_gen_remap_deps := $(glapi_gen_common_deps)
 # $(2): empty, es1, or es2 for entry point filtering
 define glapi_gen_remap
 < at >mkdir -p $(dir $< at >)
-$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_remap_script) \
+$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_remap_script) \
 -f $(1) $(if $(2),-c $(2),) > $< at >
 endef

[PATCH 2/8] shared-glapi: Don't forget to clean ourbuilt file.

Eric Anholt — 2012-05-24T23:45:06

---
 src/mapi/shared-glapi/Makefile.am |    1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am
index a80ba1f..9485683 100644
--- a/src/mapi/shared-glapi/Makefile.am
+++ b/src/mapi/shared-glapi/Makefile.am
< at >< at > -13,6 +13,7 < at >< at > glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
 $(call glapi_gen_mapi,$<,shared-glapi)
 
 BUILT_SOURCES = glapi_mapi_tmp.h
+CLEANFILES = $(BUILT_SOURCES)
 
 AM_CPPFLAGS =\
 $(DEFINES)\