From 4040fff81d6bafdf71fae86fc4cb17bf007194af Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 22 Apr 2016 14:48:36 -0700 Subject: [PATCH] i965/blorp: Convert state setup to C Reviewed-by: Topi Pohjolainen Reviewed-by: Matt Turner --- configure.ac | 3 +++ src/mesa/drivers/dri/i965/Makefile.sources | 6 +++--- src/mesa/drivers/dri/i965/{gen6_blorp.cpp => gen6_blorp.c} | 1 - src/mesa/drivers/dri/i965/{gen7_blorp.cpp => gen7_blorp.c} | 0 src/mesa/drivers/dri/i965/{gen8_blorp.cpp => gen8_blorp.c} | 0 5 files changed, 6 insertions(+), 4 deletions(-) rename src/mesa/drivers/dri/i965/{gen6_blorp.cpp => gen6_blorp.c} (99%) rename src/mesa/drivers/dri/i965/{gen7_blorp.cpp => gen7_blorp.c} (100%) rename src/mesa/drivers/dri/i965/{gen8_blorp.cpp => gen8_blorp.c} (100%) diff --git a/configure.ac b/configure.ac index 35568278c1e..5f75c60bfc4 100644 --- a/configure.ac +++ b/configure.ac @@ -2657,6 +2657,9 @@ 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 +$SED -i -e 's/gen6_blorp.cpp/gen6_blorp.c/' src/mesa/drivers/dri/i965/.deps/gen6_blorp.Plo +$SED -i -e 's/gen7_blorp.cpp/gen7_blorp.c/' src/mesa/drivers/dri/i965/.deps/gen7_blorp.Plo +$SED -i -e 's/gen8_blorp.cpp/gen8_blorp.c/' src/mesa/drivers/dri/i965/.deps/gen8_blorp.Plo dnl diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index fe70d3a1881..441d727bce5 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -177,7 +177,7 @@ i965_FILES = \ brw_wm.h \ brw_wm_state.c \ brw_wm_surface_state.c \ - gen6_blorp.cpp \ + gen6_blorp.c \ gen6_cc.c \ gen6_clip_state.c \ gen6_constant_state.c \ @@ -195,7 +195,7 @@ i965_FILES = \ gen6_viewport_state.c \ gen6_vs_state.c \ gen6_wm_state.c \ - gen7_blorp.cpp \ + gen7_blorp.c \ gen7_cs_state.c \ gen7_ds_state.c \ gen7_gs_state.c \ @@ -211,7 +211,7 @@ i965_FILES = \ gen7_wm_state.c \ gen7_wm_surface_state.c \ gen8_blend_state.c \ - gen8_blorp.cpp \ + gen8_blorp.c \ gen8_depth_state.c \ gen8_disable.c \ gen8_draw_upload.c \ diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.c similarity index 99% rename from src/mesa/drivers/dri/i965/gen6_blorp.cpp rename to src/mesa/drivers/dri/i965/gen6_blorp.c index ee3276ee460..1955811b002 100644 --- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen6_blorp.c @@ -1047,4 +1047,3 @@ gen6_blorp_exec(struct brw_context *brw, gen6_blorp_emit_drawing_rectangle(brw, params); gen6_blorp_emit_primitive(brw, params); } - diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.c similarity index 100% rename from src/mesa/drivers/dri/i965/gen7_blorp.cpp rename to src/mesa/drivers/dri/i965/gen7_blorp.c diff --git a/src/mesa/drivers/dri/i965/gen8_blorp.cpp b/src/mesa/drivers/dri/i965/gen8_blorp.c similarity index 100% rename from src/mesa/drivers/dri/i965/gen8_blorp.cpp rename to src/mesa/drivers/dri/i965/gen8_blorp.c -- 2.30.2