i965: Move a couple of GLSL IR -> BRW helper functions to brw_shader.cpp.
These will be used by the VS backend as well. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
14b86f3c91
commit
b7b700aeb0
|
@ -41,6 +41,7 @@ extern "C" {
|
|||
#include "brw_eu.h"
|
||||
#include "brw_wm.h"
|
||||
}
|
||||
#include "brw_shader.h"
|
||||
#include "brw_fs.h"
|
||||
#include "../glsl/glsl_types.h"
|
||||
#include "../glsl/ir_print_visitor.h"
|
||||
|
@ -198,31 +199,6 @@ fs_reg::fs_reg(enum register_file file, int hw_reg, uint32_t type)
|
|||
this->type = type;
|
||||
}
|
||||
|
||||
int
|
||||
brw_type_for_base_type(const struct glsl_type *type)
|
||||
{
|
||||
switch (type->base_type) {
|
||||
case GLSL_TYPE_FLOAT:
|
||||
return BRW_REGISTER_TYPE_F;
|
||||
case GLSL_TYPE_INT:
|
||||
case GLSL_TYPE_BOOL:
|
||||
return BRW_REGISTER_TYPE_D;
|
||||
case GLSL_TYPE_UINT:
|
||||
return BRW_REGISTER_TYPE_UD;
|
||||
case GLSL_TYPE_ARRAY:
|
||||
case GLSL_TYPE_STRUCT:
|
||||
case GLSL_TYPE_SAMPLER:
|
||||
/* These should be overridden with the type of the member when
|
||||
* dereferenced into. BRW_REGISTER_TYPE_UD seems like a likely
|
||||
* way to trip up if we don't.
|
||||
*/
|
||||
return BRW_REGISTER_TYPE_UD;
|
||||
default:
|
||||
assert(!"not reached");
|
||||
return BRW_REGISTER_TYPE_F;
|
||||
}
|
||||
}
|
||||
|
||||
/** Automatic reg constructor. */
|
||||
fs_reg::fs_reg(class fs_visitor *v, const struct glsl_type *type)
|
||||
{
|
||||
|
@ -730,30 +706,6 @@ fs_visitor::try_emit_saturate(ir_expression *ir)
|
|||
return true;
|
||||
}
|
||||
|
||||
static uint32_t
|
||||
brw_conditional_for_comparison(unsigned int op)
|
||||
{
|
||||
switch (op) {
|
||||
case ir_binop_less:
|
||||
return BRW_CONDITIONAL_L;
|
||||
case ir_binop_greater:
|
||||
return BRW_CONDITIONAL_G;
|
||||
case ir_binop_lequal:
|
||||
return BRW_CONDITIONAL_LE;
|
||||
case ir_binop_gequal:
|
||||
return BRW_CONDITIONAL_GE;
|
||||
case ir_binop_equal:
|
||||
case ir_binop_all_equal: /* same as equal for scalars */
|
||||
return BRW_CONDITIONAL_Z;
|
||||
case ir_binop_nequal:
|
||||
case ir_binop_any_nequal: /* same as nequal for scalars */
|
||||
return BRW_CONDITIONAL_NZ;
|
||||
default:
|
||||
assert(!"not reached: bad operation for comparison");
|
||||
return BRW_CONDITIONAL_NZ;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
fs_visitor::visit(ir_expression *ir)
|
||||
{
|
||||
|
|
|
@ -125,3 +125,53 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
|
|||
|
||||
return GL_TRUE;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
brw_type_for_base_type(const struct glsl_type *type)
|
||||
{
|
||||
switch (type->base_type) {
|
||||
case GLSL_TYPE_FLOAT:
|
||||
return BRW_REGISTER_TYPE_F;
|
||||
case GLSL_TYPE_INT:
|
||||
case GLSL_TYPE_BOOL:
|
||||
return BRW_REGISTER_TYPE_D;
|
||||
case GLSL_TYPE_UINT:
|
||||
return BRW_REGISTER_TYPE_UD;
|
||||
case GLSL_TYPE_ARRAY:
|
||||
case GLSL_TYPE_STRUCT:
|
||||
case GLSL_TYPE_SAMPLER:
|
||||
/* These should be overridden with the type of the member when
|
||||
* dereferenced into. BRW_REGISTER_TYPE_UD seems like a likely
|
||||
* way to trip up if we don't.
|
||||
*/
|
||||
return BRW_REGISTER_TYPE_UD;
|
||||
default:
|
||||
assert(!"not reached");
|
||||
return BRW_REGISTER_TYPE_F;
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t
|
||||
brw_conditional_for_comparison(unsigned int op)
|
||||
{
|
||||
switch (op) {
|
||||
case ir_binop_less:
|
||||
return BRW_CONDITIONAL_L;
|
||||
case ir_binop_greater:
|
||||
return BRW_CONDITIONAL_G;
|
||||
case ir_binop_lequal:
|
||||
return BRW_CONDITIONAL_LE;
|
||||
case ir_binop_gequal:
|
||||
return BRW_CONDITIONAL_GE;
|
||||
case ir_binop_equal:
|
||||
case ir_binop_all_equal: /* same as equal for scalars */
|
||||
return BRW_CONDITIONAL_Z;
|
||||
case ir_binop_nequal:
|
||||
case ir_binop_any_nequal: /* same as nequal for scalars */
|
||||
return BRW_CONDITIONAL_NZ;
|
||||
default:
|
||||
assert(!"not reached: bad operation for comparison");
|
||||
return BRW_CONDITIONAL_NZ;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
int brw_type_for_base_type(const struct glsl_type *type);
|
||||
uint32_t brw_conditional_for_comparison(unsigned int op);
|
Loading…
Reference in New Issue