--- src/mesa/drivers/dri/i965/Makefile.sources | 2 -- src/mesa/drivers/dri/i965/brw_blorp.cpp | 2 -- src/mesa/drivers/dri/i965/brw_blorp.h | 7 +++++ src/mesa/drivers/dri/i965/gen6_blorp.cpp | 1 - src/mesa/drivers/dri/i965/gen6_blorp.h | 41 ------------------------------ src/mesa/drivers/dri/i965/gen7_blorp.cpp | 1 - src/mesa/drivers/dri/i965/gen7_blorp.h | 41 ------------------------------ 7 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 src/mesa/drivers/dri/i965/gen6_blorp.h delete mode 100644 src/mesa/drivers/dri/i965/gen7_blorp.h
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 5a88d66..5e805fa 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -162,7 +162,6 @@ i965_FILES = \ brw_wm_state.c \ brw_wm_surface_state.c \ gen6_blorp.cpp \ - gen6_blorp.h \ gen6_cc.c \ gen6_clip_state.c \ gen6_depth_state.c \ @@ -180,7 +179,6 @@ i965_FILES = \ gen6_vs_state.c \ gen6_wm_state.c \ gen7_blorp.cpp \ - gen7_blorp.h \ gen7_cs_state.c \ gen7_disable.c \ gen7_gs_state.c \ diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/i965/brw_blorp.cpp index df2969d..577b71e 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp @@ -28,8 +28,6 @@ #include "brw_blorp.h" #include "brw_defines.h" #include "brw_state.h" -#include "gen6_blorp.h" -#include "gen7_blorp.h" #define FILE_DEBUG_FLAG DEBUG_BLORP diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h index dd28d81..ae494f9 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.h +++ b/src/mesa/drivers/dri/i965/brw_blorp.h @@ -238,6 +238,13 @@ public: void brw_blorp_exec(struct brw_context *brw, const brw_blorp_params *params); +void +gen6_blorp_exec(struct brw_context *brw, + const brw_blorp_params *params); + +void +gen7_blorp_exec(struct brw_context *brw, + const brw_blorp_params *params); /** * Parameters for a HiZ or depth resolve operation. diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp index 74f3a70..23fea5a 100644 --- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp @@ -32,7 +32,6 @@ #include "brw_state.h" #include "brw_blorp.h" -#include "gen6_blorp.h" /** * \name Constants for BLORP VBO diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.h b/src/mesa/drivers/dri/i965/gen6_blorp.h deleted file mode 100644 index 1b273a4..0000000 --- a/src/mesa/drivers/dri/i965/gen6_blorp.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright © 2011 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. - */ - -#pragma once - -#include <stdint.h> - -#ifdef __cplusplus -extern "C" { -#endif - -struct intel_mipmap_tree; - -#ifdef __cplusplus -} - -void -gen6_blorp_exec(struct brw_context *brw, - const brw_blorp_params *params); - -#endif diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp index f90e78e..4c6ab0c 100644 --- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp @@ -32,7 +32,6 @@ #include "brw_state.h" #include "brw_blorp.h" -#include "gen7_blorp.h" /* 3DSTATE_URB_VS diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.h b/src/mesa/drivers/dri/i965/gen7_blorp.h deleted file mode 100644 index 6443430..0000000 --- a/src/mesa/drivers/dri/i965/gen7_blorp.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright © 2011 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. - */ - -#pragma once - -#include <stdint.h> - -#ifdef __cplusplus -extern "C" { -#endif - -struct intel_mipmap_tree; - -#ifdef __cplusplus -} - -void -gen7_blorp_exec(struct brw_context *brw, - const brw_blorp_params *params); - -#endif -- 2.4.9 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev