From 8ee23d6866b9325450d787e5d55a367423ae4316 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 18 Jun 2016 23:36:59 -0700 Subject: [PATCH] i965: Move contents of brw_tex.c into intel_tex_validate.c. brw_tex.c is a tiny file containing a single function. It's closely tied to the validation logic in intel_tex_validate.c, so it makes sense to put both in the same file. While we're at it, update the function to our modern style. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/Makefile.sources | 1 - src/mesa/drivers/dri/i965/brw_context.h | 2 +- src/mesa/drivers/dri/i965/brw_tex.c | 56 ------------------- .../drivers/dri/i965/intel_tex_validate.c | 19 +++++++ 4 files changed, 20 insertions(+), 58 deletions(-) delete mode 100644 src/mesa/drivers/dri/i965/brw_tex.c diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index f448551cca3..0d2f4f1675b 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -163,7 +163,6 @@ i965_FILES = \ brw_tcs_surface_state.c \ brw_tes.c \ brw_tes_surface_state.c \ - brw_tex.c \ brw_tex_layout.c \ brw_urb.c \ brw_vs.c \ diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 6e84506e184..9d7a5b45c36 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1472,7 +1472,7 @@ void brw_debug_batch(struct brw_context *brw); void brw_annotate_aub(struct brw_context *brw); /*====================================================================== - * brw_tex.c + * intel_tex_validate.c */ void brw_validate_textures( struct brw_context *brw ); diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c deleted file mode 100644 index 7aebac63445..00000000000 --- a/src/mesa/drivers/dri/i965/brw_tex.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright (C) Intel Corp. 2006. All Rights Reserved. - Intel funded Tungsten Graphics to - develop this 3D driver. - - 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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. - - **********************************************************************/ - /* - * Authors: - * Keith Whitwell - */ - - -#include "main/mtypes.h" -#include "main/teximage.h" - -#include "intel_tex.h" -#include "brw_context.h" - -/** - * Finalizes all textures, completing any rendering that needs to be done - * to prepare them. - */ -void brw_validate_textures( struct brw_context *brw ) -{ - struct gl_context *ctx = &brw->ctx; - int i; - int maxEnabledUnit = ctx->Texture._MaxEnabledTexImageUnit; - - for (i = 0; i <= maxEnabledUnit; i++) { - struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i]; - - if (texUnit->_Current) { - intel_finalize_mipmap_tree(brw, i); - } - } -} diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c index 3a811e10359..19a854e86d7 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c @@ -183,3 +183,22 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit) return true; } + +/** + * Finalizes all textures, completing any rendering that needs to be done + * to prepare them. + */ +void +brw_validate_textures(struct brw_context *brw) +{ + struct gl_context *ctx = &brw->ctx; + const int max_enabled_unit = ctx->Texture._MaxEnabledTexImageUnit; + + for (int unit = 0; unit <= max_enabled_unit; unit++) { + struct gl_texture_unit *tex_unit = &ctx->Texture.Unit[unit]; + + if (tex_unit->_Current) { + intel_finalize_mipmap_tree(brw, unit); + } + } +} -- 2.30.2