AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallivm: Factor out the quad derivative code into a single place. Fix ddy.

Browse Source 
For ddy it should be (bottom - top).
This commit is contained in:
José Fonseca
2010-06-03 14:16:59 +01:00
parent 9eb730a735
commit ef81779850
5 changed files with 204 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/Makefile
+1
View File
@@ -158,6 +158,7 @@ GALLIVM_SOURCES = \
gallivm/lp_bld_logic.c \
gallivm/lp_bld_pack.c \
gallivm/lp_bld_printf.c \
gallivm/lp_bld_quad.c \
gallivm/lp_bld_sample.c \
gallivm/lp_bld_sample_soa.c \
gallivm/lp_bld_struct.c \
src/gallium/auxiliary/SConscript
+1
View File
@@ -208,6 +208,7 @@ if env['llvm']:
'gallivm/lp_bld_misc.cpp',
'gallivm/lp_bld_pack.c',
'gallivm/lp_bld_printf.c',
'gallivm/lp_bld_quad.c',
'gallivm/lp_bld_sample.c',
'gallivm/lp_bld_sample_soa.c',
'gallivm/lp_bld_struct.c',
src/gallium/auxiliary/gallivm/lp_bld_quad.c
+101
View File
@@ -0,0 +1,101 @@
/**************************************************************************
*
* Copyright 2010 VMware, Inc.
* All Rights Reserved.
*
* 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDERS, AUTHORS 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.
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
**************************************************************************/
#include "lp_bld_type.h"
#include "lp_bld_arit.h"
#include "lp_bld_swizzle.h"
#include "lp_bld_quad.h"
static const unsigned char
swizzle_left[4] = {
LP_BLD_QUAD_TOP_LEFT, LP_BLD_QUAD_TOP_LEFT,
LP_BLD_QUAD_BOTTOM_LEFT, LP_BLD_QUAD_BOTTOM_LEFT
};
static const unsigned char
swizzle_right[4] = {
LP_BLD_QUAD_TOP_RIGHT, LP_BLD_QUAD_TOP_RIGHT,
LP_BLD_QUAD_BOTTOM_RIGHT, LP_BLD_QUAD_BOTTOM_RIGHT
};
static const unsigned char
swizzle_top[4] = {
LP_BLD_QUAD_TOP_LEFT, LP_BLD_QUAD_TOP_RIGHT,
LP_BLD_QUAD_TOP_LEFT, LP_BLD_QUAD_TOP_RIGHT
};
static const unsigned char
swizzle_bottom[4] = {
LP_BLD_QUAD_BOTTOM_LEFT, LP_BLD_QUAD_BOTTOM_RIGHT,
LP_BLD_QUAD_BOTTOM_LEFT, LP_BLD_QUAD_BOTTOM_RIGHT
};
LLVMValueRef
lp_build_ddx(struct lp_build_context *bld,
LLVMValueRef a)
{
LLVMValueRef a_left = lp_build_swizzle1_aos(bld, a, swizzle_left);
LLVMValueRef a_right = lp_build_swizzle1_aos(bld, a, swizzle_right);
return lp_build_sub(bld, a_right, a_left);
}
LLVMValueRef
lp_build_ddy(struct lp_build_context *bld,
LLVMValueRef a)
{
LLVMValueRef a_top = lp_build_swizzle1_aos(bld, a, swizzle_top);
LLVMValueRef a_bottom = lp_build_swizzle1_aos(bld, a, swizzle_bottom);
return lp_build_sub(bld, a_bottom, a_top);
}
LLVMValueRef
lp_build_scalar_ddx(struct lp_build_context *bld,
LLVMValueRef a)
{
LLVMValueRef idx_left = LLVMConstInt(LLVMInt32Type(), LP_BLD_QUAD_TOP_LEFT, 0);
LLVMValueRef idx_right = LLVMConstInt(LLVMInt32Type(), LP_BLD_QUAD_TOP_RIGHT, 0);
LLVMValueRef a_left = LLVMBuildExtractElement(bld->builder, a, idx_left, "");
LLVMValueRef a_right = LLVMBuildExtractElement(bld->builder, a, idx_right, "");
return LLVMBuildSub(bld->builder, a_right, a_left, "");
}
LLVMValueRef
lp_build_scalar_ddy(struct lp_build_context *bld,
LLVMValueRef a)
{
LLVMValueRef idx_top = LLVMConstInt(LLVMInt32Type(), LP_BLD_QUAD_TOP_LEFT, 0);
LLVMValueRef idx_bottom = LLVMConstInt(LLVMInt32Type(), LP_BLD_QUAD_BOTTOM_LEFT, 0);
LLVMValueRef a_top = LLVMBuildExtractElement(bld->builder, a, idx_top, "");
LLVMValueRef a_bottom = LLVMBuildExtractElement(bld->builder, a, idx_bottom, "");
return LLVMBuildSub(bld->builder, a_bottom, a_top, "");
}
src/gallium/auxiliary/gallivm/lp_bld_quad.h
+96
View File
@@ -0,0 +1,96 @@
/**************************************************************************
*
* Copyright 2010 VMware, Inc.
* All Rights Reserved.
*
* 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDERS, AUTHORS 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.
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
**************************************************************************/
#ifndef LP_BLD_QUAD_H_
#define LP_BLD_QUAD_H_
#include "gallivm/lp_bld.h"
struct lp_build_context;
/*
* Each quad is composed of four elements.
*
* #########
* # 0 | 1 #
* #---+---#
* # 2 | 3 #
* #########
*/
enum lp_bld_quad {
LP_BLD_QUAD_TOP_LEFT = 0,
LP_BLD_QUAD_TOP_RIGHT = 1,
LP_BLD_QUAD_BOTTOM_LEFT = 2,
LP_BLD_QUAD_BOTTOM_RIGHT = 3
};
/*
* (Vector) derivates.
*
* More than one quad is supported. The only requirement is that the vector
* contains a whole number of quads:
*
* ######### ######### ...
* # 0 | 1 # # 4 | 5 #
* #---+---# #---+---# ...
* # 2 | 3 # # 6 | 7 #
* ######### ######### ...
*/
LLVMValueRef
lp_build_ddx(struct lp_build_context *bld,
LLVMValueRef a);
LLVMValueRef
lp_build_ddy(struct lp_build_context *bld,
LLVMValueRef a);
/*
* Scalar derivatives.
*
* Same as getting the first value of above.
*/
LLVMValueRef
lp_build_scalar_ddx(struct lp_build_context *bld,
LLVMValueRef a);
LLVMValueRef
lp_build_scalar_ddy(struct lp_build_context *bld,
LLVMValueRef a);
#endif /* LP_BLD_QUAD_H_ */
src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+5 -52
View File
@@ -53,6 +53,7 @@
#include "lp_bld_logic.h"
#include "lp_bld_swizzle.h"
#include "lp_bld_flow.h"
#include "lp_bld_quad.h"
#include "lp_bld_tgsi.h"
#include "lp_bld_limits.h"
#include "lp_bld_debug.h"
@@ -76,11 +77,6 @@
#define CHAN_Z 2
#define CHAN_W 3
#define QUAD_TOP_LEFT 0
#define QUAD_TOP_RIGHT 1
#define QUAD_BOTTOM_LEFT 2
#define QUAD_BOTTOM_RIGHT 3
#define LP_MAX_INSTRUCTIONS 256
@@ -148,30 +144,6 @@ struct lp_build_tgsi_soa_context
uint max_instructions;
};
static const unsigned char
swizzle_left[4] = {
QUAD_TOP_LEFT, QUAD_TOP_LEFT,
QUAD_BOTTOM_LEFT, QUAD_BOTTOM_LEFT
};
static const unsigned char
swizzle_right[4] = {
QUAD_TOP_RIGHT, QUAD_TOP_RIGHT,
QUAD_BOTTOM_RIGHT, QUAD_BOTTOM_RIGHT
};
static const unsigned char
swizzle_top[4] = {
QUAD_TOP_LEFT, QUAD_TOP_RIGHT,
QUAD_TOP_LEFT, QUAD_TOP_RIGHT
};
static const unsigned char
swizzle_bottom[4] = {
QUAD_BOTTOM_LEFT, QUAD_BOTTOM_RIGHT,
QUAD_BOTTOM_LEFT, QUAD_BOTTOM_RIGHT
};
static void lp_exec_mask_init(struct lp_exec_mask *mask, struct lp_build_context *bld)
{
mask->bld = bld;
@@ -432,25 +404,6 @@ static void lp_exec_mask_endsub(struct lp_exec_mask *mask, int *pc)
lp_exec_mask_update(mask);
}
static LLVMValueRef
emit_ddx(struct lp_build_tgsi_soa_context *bld,
LLVMValueRef src)
{
LLVMValueRef src_left = lp_build_swizzle1_aos(&bld->base, src, swizzle_left);
LLVMValueRef src_right = lp_build_swizzle1_aos(&bld->base, src, swizzle_right);
return lp_build_sub(&bld->base, src_right, src_left);
}
static LLVMValueRef
emit_ddy(struct lp_build_tgsi_soa_context *bld,
LLVMValueRef src)
{
LLVMValueRef src_top = lp_build_swizzle1_aos(&bld->base, src, swizzle_top);
LLVMValueRef src_bottom = lp_build_swizzle1_aos(&bld->base, src, swizzle_bottom);
return lp_build_sub(&bld->base, src_top, src_bottom);
}
static LLVMValueRef
get_temp_ptr(struct lp_build_tgsi_soa_context *bld,
unsigned index,
@@ -599,10 +552,10 @@ emit_fetch_deriv(
/* TODO: use interpolation coeffs for inputs */
if(ddx)
*ddx = emit_ddx(bld, src);
*ddx = lp_build_ddx(&bld->base, src);
if(ddy)
*ddy = emit_ddy(bld, src);
*ddy = lp_build_ddy(&bld->base, src);
}
@@ -842,8 +795,8 @@ emit_tex( struct lp_build_tgsi_soa_context *bld,
unit = inst->Src[3].Register.Index;
} else {
for (i = 0; i < num_coords; i++) {
ddx[i] = emit_ddx( bld, coords[i] );
ddy[i] = emit_ddy( bld, coords[i] );
ddx[i] = lp_build_ddx( &bld->base, coords[i] );
ddy[i] = lp_build_ddy( &bld->base, coords[i] );
}
unit = inst->Src[1].Register.Index;
}