Mesa (gallium-llvmpipe): llvmpipe: Drop blend derived state.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun Aug 23 11:29:26 UTC 2009
Module: Mesa
Branch: gallium-llvmpipe
Commit: cc3f55fee7ea268fd8972644e1bd4387aa1c7be7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc3f55fee7ea268fd8972644e1bd4387aa1c7be7
Author: José Fonseca <jfonseca at vmware.com>
Date: Sat Aug 22 23:30:28 2009 +0100
llvmpipe: Drop blend derived state.
Already included in the fragment shader.
---
src/gallium/drivers/llvmpipe/lp_context.h | 2 +-
src/gallium/drivers/llvmpipe/lp_state.h | 17 ---
src/gallium/drivers/llvmpipe/lp_state_blend.c | 146 +------------------------
src/gallium/drivers/llvmpipe/lp_state_fs.c | 2 +-
4 files changed, 6 insertions(+), 161 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_context.h b/src/gallium/drivers/llvmpipe/lp_context.h
index 1d0896a..77263e4 100644
--- a/src/gallium/drivers/llvmpipe/lp_context.h
+++ b/src/gallium/drivers/llvmpipe/lp_context.h
@@ -52,7 +52,7 @@ struct llvmpipe_context {
struct pipe_context pipe; /**< base class */
/** Constant state objects */
- struct lp_blend_state *blend;
+ const struct pipe_blend_state *blend;
const struct pipe_sampler_state *sampler[PIPE_MAX_SAMPLERS];
const struct pipe_depth_stencil_alpha_state *depth_stencil;
const struct pipe_rasterizer_state *rasterizer;
diff --git a/src/gallium/drivers/llvmpipe/lp_state.h b/src/gallium/drivers/llvmpipe/lp_state.h
index 83dace3..2b1f2e4 100644
--- a/src/gallium/drivers/llvmpipe/lp_state.h
+++ b/src/gallium/drivers/llvmpipe/lp_state.h
@@ -120,23 +120,6 @@ struct lp_vertex_shader {
};
-typedef void
-(*lp_blend_func)(const uint8_t *mask,
- const uint8_t *src,
- const uint8_t *con,
- uint8_t *dst);
-
-
-struct lp_blend_state
-{
- struct pipe_blend_state base;
-
- LLVMValueRef function;
-
- lp_blend_func jit_function;
-};
-
-
void *
llvmpipe_create_blend_state(struct pipe_context *,
diff --git a/src/gallium/drivers/llvmpipe/lp_state_blend.c b/src/gallium/drivers/llvmpipe/lp_state_blend.c
index d0cdcd8..ebde41c 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_blend.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_blend.c
@@ -38,141 +38,12 @@
#include "lp_context.h"
#include "lp_state.h"
-#include "lp_bld_type.h"
-#include "lp_bld_arit.h"
-#include "lp_bld_logic.h"
-#include "lp_bld_blend.h"
-#include "lp_bld_debug.h"
-
-
-/**
- * Generate blending code according to blend->base state.
- * The blend function will look like:
- * blend(mask, src_color, constant color, dst_color)
- * dst_color will be modified and contain the result of the blend func.
- */
-static void
-blend_generate(struct llvmpipe_screen *screen,
- struct lp_blend_state *blend)
-{
- union lp_type type;
- struct lp_build_context bld;
- LLVMTypeRef vec_type;
- LLVMTypeRef int_vec_type;
- LLVMTypeRef arg_types[4];
- LLVMTypeRef func_type;
- LLVMValueRef mask_ptr;
- LLVMValueRef src_ptr;
- LLVMValueRef dst_ptr;
- LLVMValueRef const_ptr;
- LLVMBasicBlockRef block;
- LLVMBuilderRef builder;
- LLVMValueRef mask;
- LLVMValueRef src[4];
- LLVMValueRef con[4];
- LLVMValueRef dst[4];
- LLVMValueRef res[4];
- unsigned i;
-
- type.value = 0;
- type.floating = FALSE; /* values are integers */
- type.sign = FALSE; /* values are unsigned */
- type.norm = TRUE; /* values are in [0,1] or [-1,1] */
- type.width = 8; /* 8-bit ubyte values */
- type.length = 16; /* 16 elements per vector */
-
- vec_type = lp_build_vec_type(type);
- int_vec_type = lp_build_int_vec_type(type);
-
- arg_types[0] = LLVMPointerType(int_vec_type, 0); /* mask */
- arg_types[1] = LLVMPointerType(vec_type, 0); /* src */
- arg_types[2] = LLVMPointerType(vec_type, 0); /* con */
- arg_types[3] = LLVMPointerType(vec_type, 0); /* dst */
- func_type = LLVMFunctionType(LLVMVoidType(), arg_types, Elements(arg_types), 0);
- blend->function = LLVMAddFunction(screen->module, "blend", func_type);
- LLVMSetFunctionCallConv(blend->function, LLVMCCallConv);
-
- mask_ptr = LLVMGetParam(blend->function, 0);
- src_ptr = LLVMGetParam(blend->function, 1);
- const_ptr = LLVMGetParam(blend->function, 2);
- dst_ptr = LLVMGetParam(blend->function, 3);
-
- block = LLVMAppendBasicBlock(blend->function, "entry");
- builder = LLVMCreateBuilder();
- LLVMPositionBuilderAtEnd(builder, block);
-
- lp_build_context_init(&bld, builder, type);
-
- mask = LLVMBuildLoad(builder, mask_ptr, "mask");
-
- for(i = 0; i < 4; ++i) {
- LLVMValueRef index = LLVMConstInt(LLVMInt32Type(), i, 0);
-
- src[i] = LLVMBuildLoad(builder, LLVMBuildGEP(builder, src_ptr, &index, 1, ""), "");
- con[i] = LLVMBuildLoad(builder, LLVMBuildGEP(builder, const_ptr, &index, 1, ""), "");
- dst[i] = LLVMBuildLoad(builder, LLVMBuildGEP(builder, dst_ptr, &index, 1, ""), "");
-
- lp_build_name(src[i], "src.%c", "rgba"[i]);
- lp_build_name(con[i], "con.%c", "rgba"[i]);
- lp_build_name(dst[i], "dst.%c", "rgba"[i]);
- }
-
- lp_build_blend_soa(builder, &blend->base, type, src, dst, con, res);
-
- for(i = 0; i < 4; ++i) {
- LLVMValueRef index = LLVMConstInt(LLVMInt32Type(), i, 0);
- lp_build_name(res[i], "res.%c", "rgba"[i]);
- res[i] = lp_build_select(&bld, mask, res[i], dst[i]);
- LLVMBuildStore(builder, res[i], LLVMBuildGEP(builder, dst_ptr, &index, 1, ""));
- }
-
- LLVMBuildRetVoid(builder);;
-
- LLVMDisposeBuilder(builder);
-}
-
void *
llvmpipe_create_blend_state(struct pipe_context *pipe,
- const struct pipe_blend_state *base)
+ const struct pipe_blend_state *blend)
{
- struct llvmpipe_screen *screen = llvmpipe_screen(pipe->screen);
- struct lp_blend_state *blend;
-
- blend = CALLOC_STRUCT(lp_blend_state);
- if(!blend)
- return NULL;
-
- blend->base = *base;
-
- blend_generate(screen, blend);
-
- LLVMRunFunctionPassManager(screen->pass, blend->function);
-
-#ifdef DEBUG
- debug_printf("%s=%s %s=%s %s=%s %s=%s %s=%s %s=%s\n",
- "rgb_func", debug_dump_blend_func (blend->base.rgb_func, TRUE),
- "rgb_src_factor", debug_dump_blend_factor(blend->base.rgb_src_factor, TRUE),
- "rgb_dst_factor", debug_dump_blend_factor(blend->base.rgb_dst_factor, TRUE),
- "alpha_func", debug_dump_blend_func (blend->base.alpha_func, TRUE),
- "alpha_src_factor", debug_dump_blend_factor(blend->base.alpha_src_factor, TRUE),
- "alpha_dst_factor", debug_dump_blend_factor(blend->base.alpha_dst_factor, TRUE));
- LLVMDumpValue(blend->function);
- debug_printf("\n");
-#endif
-
- if(LLVMVerifyFunction(blend->function, LLVMPrintMessageAction)) {
- LLVMDumpValue(blend->function);
- abort();
- }
-
- blend->jit_function = (lp_blend_func)LLVMGetPointerToGlobal(screen->engine, blend->function);
-
-#ifdef DEBUG
- lp_disassemble(blend->jit_function);
-#endif
-
- return blend;
+ return mem_dup(blend, sizeof(*blend));
}
void llvmpipe_bind_blend_state( struct pipe_context *pipe,
@@ -180,23 +51,14 @@ void llvmpipe_bind_blend_state( struct pipe_context *pipe,
{
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
- llvmpipe->blend = (struct lp_blend_state *)blend;
+ llvmpipe->blend = blend;
llvmpipe->dirty |= LP_NEW_BLEND;
}
void llvmpipe_delete_blend_state(struct pipe_context *pipe,
- void *_blend)
+ void *blend)
{
- struct llvmpipe_screen *screen = llvmpipe_screen(pipe->screen);
- struct lp_blend_state *blend = (struct lp_blend_state *)_blend;
-
- if(blend->function) {
- if(blend->jit_function)
- LLVMFreeMachineCodeForFunction(screen->engine, blend->function);
- LLVMDeleteFunction(blend->function);
- }
-
FREE( blend );
}
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index a9b2d48..cf0a90b 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -714,7 +714,7 @@ llvmpipe_update_fs(struct llvmpipe_context *lp)
memset(&key, 0, sizeof key);
memcpy(&key.depth, &lp->depth_stencil->depth, sizeof &key.depth);
memcpy(&key.alpha, &lp->depth_stencil->alpha, sizeof &key.alpha);
- memcpy(&key.blend, &lp->blend->base, sizeof &key.blend);
+ memcpy(&key.blend, lp->blend, sizeof &key.blend);
variant = shader->variants;
while(variant) {
More information about the mesa-commit
mailing list