From 305044c5b14b635676d1585b6a1822d11fdcf0a6 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 9 Jun 2016 18:29:15 -0700 Subject: [PATCH] i965: Get rid of gen6_surface_state.c The only useful thing left was gen6_init_vtable_surface_functions which we can easily put in brw_wm_surface_state.c. Signed-off-by: Jason Ekstrand Reviewed-by: Topi Pohjolainen Reviewed-by: Chad Versace --- src/mesa/drivers/dri/i965/Makefile.sources | 1 - .../drivers/dri/i965/brw_wm_surface_state.c | 7 +++ .../drivers/dri/i965/gen6_surface_state.c | 48 ------------------- 3 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 src/mesa/drivers/dri/i965/gen6_surface_state.c diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 0d2f4f1675b..ca7591f7b05 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -186,7 +186,6 @@ i965_FILES = \ gen6_scissor_state.c \ gen6_sf_state.c \ gen6_sol.c \ - gen6_surface_state.c \ gen6_urb.c \ gen6_viewport_state.c \ gen6_vs_state.c \ diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index fdb18337493..f24f0f503b6 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -1592,6 +1592,13 @@ gen4_init_vtable_surface_functions(struct brw_context *brw) brw->vtbl.emit_null_surface_state = brw_emit_null_surface_state; } +void +gen6_init_vtable_surface_functions(struct brw_context *brw) +{ + gen4_init_vtable_surface_functions(brw); + brw->vtbl.update_renderbuffer_surface = brw_update_renderbuffer_surface; +} + static void brw_upload_cs_work_groups_surface(struct brw_context *brw) { diff --git a/src/mesa/drivers/dri/i965/gen6_surface_state.c b/src/mesa/drivers/dri/i965/gen6_surface_state.c deleted file mode 100644 index 84b8ef47475..00000000000 --- a/src/mesa/drivers/dri/i965/gen6_surface_state.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2014 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. - */ - - -#include "main/context.h" -#include "main/blend.h" -#include "main/mtypes.h" -#include "main/samplerobj.h" -#include "main/texformat.h" -#include "program/prog_parameter.h" - -#include "intel_mipmap_tree.h" -#include "intel_batchbuffer.h" -#include "intel_tex.h" -#include "intel_fbo.h" -#include "intel_buffer_objects.h" - -#include "brw_context.h" -#include "brw_state.h" -#include "brw_defines.h" -#include "brw_wm.h" - -void -gen6_init_vtable_surface_functions(struct brw_context *brw) -{ - gen4_init_vtable_surface_functions(brw); - brw->vtbl.update_renderbuffer_surface = brw_update_renderbuffer_surface; -} -- 2.30.2