summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2017-02-28 19:08:22 -0800
committerJason Ekstrand <jason.ekstrand@intel.com>2017-03-01 16:14:03 -0800
commit818bfdfa1569d271639548b94816d7e749e77bde (patch)
treeeb531436b5c8441d0410c49957935d1ae0fffd37 /src/mesa/drivers/dri
parent7ac47b1af767d873b4e463ab479ac0effb49211c (diff)
i965: Delete brw_do_cubemap_normalize
This hasn't been used for quite some time now but we never bothered to get rid of it when we dropped GLSL IR support for vec4. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.sources1
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp121
3 files changed, 0 insertions, 124 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 1dd109b83ea..4711be07b49 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -111,7 +111,6 @@ i965_FILES = \
brw_context.h \
brw_cs.c \
brw_cs.h \
- brw_cubemap_normalize.cpp \
brw_curbe.c \
brw_draw.c \
brw_draw.h \
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index e252261f20b..288ef3a2066 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1558,8 +1558,6 @@ brw_program_reloc(struct brw_context *brw, uint32_t state_offset,
return brw->cache.bo->offset64 + prog_offset;
}
-bool brw_do_cubemap_normalize(struct exec_list *instructions);
-
static inline bool
brw_depth_writes_enabled(const struct brw_context *brw)
{
diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
deleted file mode 100644
index 2ff9ec16fdb..00000000000
--- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright © 2010 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.
- */
-
-/**
- * \file brw_cubemap_normalize.cpp
- *
- * IR lower pass to perform the normalization of the cubemap coordinates to
- * have the largest magnitude component be -1.0 or 1.0.
- *
- * \author Eric Anholt <eric@anholt.net>
- */
-
-#include "compiler/glsl_types.h"
-#include "compiler/glsl/ir.h"
-#include "program/prog_instruction.h" /* For WRITEMASK_* */
-
-class brw_cubemap_normalize_visitor : public ir_hierarchical_visitor {
-public:
- brw_cubemap_normalize_visitor()
- {
- progress = false;
- }
-
- ir_visitor_status visit_leave(ir_texture *ir);
-
- bool progress;
-};
-
-ir_visitor_status
-brw_cubemap_normalize_visitor::visit_leave(ir_texture *ir)
-{
- if (ir->sampler->type->sampler_dimensionality != GLSL_SAMPLER_DIM_CUBE)
- return visit_continue;
-
- if (!ir->coordinate)
- return visit_continue;
-
- void *mem_ctx = ralloc_parent(ir);
-
- ir_variable *var = new(mem_ctx) ir_variable(ir->coordinate->type,
- "coordinate", ir_var_auto);
- base_ir->insert_before(var);
- ir_dereference *deref = new(mem_ctx) ir_dereference_variable(var);
- ir_assignment *assign = new(mem_ctx) ir_assignment(deref, ir->coordinate,
- NULL);
- base_ir->insert_before(assign);
-
- deref = new(mem_ctx) ir_dereference_variable(var);
- ir_rvalue *swiz0 = new(mem_ctx) ir_swizzle(deref, 0, 0, 0, 0, 1);
- deref = new(mem_ctx) ir_dereference_variable(var);
- ir_rvalue *swiz1 = new(mem_ctx) ir_swizzle(deref, 1, 0, 0, 0, 1);
- deref = new(mem_ctx) ir_dereference_variable(var);
- ir_rvalue *swiz2 = new(mem_ctx) ir_swizzle(deref, 2, 0, 0, 0, 1);
-
- swiz0 = new(mem_ctx) ir_expression(ir_unop_abs, swiz0->type, swiz0, NULL);
- swiz1 = new(mem_ctx) ir_expression(ir_unop_abs, swiz1->type, swiz1, NULL);
- swiz2 = new(mem_ctx) ir_expression(ir_unop_abs, swiz2->type, swiz2, NULL);
-
- ir_expression *expr;
- expr = new(mem_ctx) ir_expression(ir_binop_max,
- glsl_type::float_type,
- swiz0, swiz1);
-
- expr = new(mem_ctx) ir_expression(ir_binop_max,
- glsl_type::float_type,
- expr, swiz2);
-
- expr = new(mem_ctx) ir_expression(ir_unop_rcp,
- glsl_type::float_type,
- expr, NULL);
-
- /* coordinate.xyz *= expr */
- assign = new(mem_ctx) ir_assignment(
- new(mem_ctx) ir_dereference_variable(var),
- new(mem_ctx) ir_swizzle(
- new(mem_ctx) ir_expression(ir_binop_mul,
- ir->coordinate->type,
- new(mem_ctx) ir_dereference_variable(var),
- expr),
- 0, 1, 2, 0, 3));
- assign->write_mask = WRITEMASK_XYZ;
- base_ir->insert_before(assign);
- ir->coordinate = new(mem_ctx) ir_dereference_variable(var);
-
- progress = true;
- return visit_continue;
-}
-
-extern "C" {
-
-bool
-brw_do_cubemap_normalize(exec_list *instructions)
-{
- brw_cubemap_normalize_visitor v;
-
- visit_list_elements(&v, instructions);
-
- return v.progress;
-}
-
-}