diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp.c (renamed from src/mesa/drivers/dri/i965/brw_blorp.cpp) | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 38d1f5baf89..35568278c1e 100644 --- a/configure.ac +++ b/configure.ac @@ -2654,6 +2654,11 @@ AC_CONFIG_FILES([Makefile AC_OUTPUT +# Fix up dependencies in *.Plo files, where we changed the extension of a +# source file +$SED -i -e 's/brw_blorp.cpp/brw_blorp.c/' src/mesa/drivers/dri/i965/.deps/brw_blorp.Plo + + dnl dnl Output some configuration info for the user dnl diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 632f2e97f0b..fe70d3a1881 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -100,7 +100,7 @@ i965_FILES = \ brw_blorp_blit_eu.cpp \ brw_blorp_blit_eu.h \ brw_blorp_clear.cpp \ - brw_blorp.cpp \ + brw_blorp.c \ brw_blorp.h \ brw_cc.c \ brw_clear.c \ diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/i965/brw_blorp.c index 3a43762116d..247fd75c8dd 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -145,7 +145,6 @@ brw_blorp_params_init(struct brw_blorp_params *params) params->num_layers = 1; } -extern "C" { /** * Perform a HiZ or depth resolve operation. * @@ -157,7 +156,7 @@ extern "C" { */ void intel_hiz_exec(struct brw_context *brw, struct intel_mipmap_tree *mt, - unsigned int level, unsigned int layer, gen6_hiz_op op) + unsigned int level, unsigned int layer, enum gen6_hiz_op op) { const char *opname = NULL; @@ -186,8 +185,6 @@ intel_hiz_exec(struct brw_context *brw, struct intel_mipmap_tree *mt, } } -} /* extern "C" */ - void brw_blorp_exec(struct brw_context *brw, const struct brw_blorp_params *params) { |