summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-04-22 16:04:05 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-04-26 14:55:22 -0700
commitbed74299c22d5f7e740f48a5ce47bc2864c09f89 (patch)
treeb33e13c8b537114fb4ee55c8071854263e126dd3 /src/mesa/drivers/dri
parent0551f3dfa4a14108dda58eceba3522c9071b2a90 (diff)
downloadexternal_mesa3d-bed74299c22d5f7e740f48a5ce47bc2864c09f89.zip
external_mesa3d-bed74299c22d5f7e740f48a5ce47bc2864c09f89.tar.gz
external_mesa3d-bed74299c22d5f7e740f48a5ce47bc2864c09f89.tar.bz2
i965/blorp: Convert brw_blorp.cpp to a C file
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.sources2
-rw-r--r--src/mesa/drivers/dri/i965/brw_blorp.c (renamed from src/mesa/drivers/dri/i965/brw_blorp.cpp)5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 632f2e9..fe70d3a 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 3a43762..247fd75 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)
{