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

llvmpipe: Include zsbuf's format in the fragment shader key.

This commit is contained in:
José Fonseca 2009-09-09 21:16:06 +01:00
parent da912a7a16
commit cdbbcdf3bd
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/llvmpipe/lp_state.h
View File

@ -66,6 +66,7 @@ struct lp_fragment_shader;
struct lp_fragment_shader_variant_key struct lp_fragment_shader_variant_key
{ {
enum pipe_format zsbuf_format;
struct pipe_depth_state depth; struct pipe_depth_state depth;
struct pipe_alpha_state alpha; struct pipe_alpha_state alpha;
struct pipe_blend_state blend; struct pipe_blend_state blend;

30
src/gallium/drivers/llvmpipe/lp_state_fs.c
View File

@ -131,9 +131,8 @@ generate_pos0(LLVMBuilderRef builder,
* Generate the depth test. * Generate the depth test.
*/ */
static void static void
generate_depth(struct llvmpipe_context *lp, generate_depth(LLVMBuilderRef builder,
LLVMBuilderRef builder, const struct lp_fragment_shader_variant_key *key,
const struct pipe_depth_state *state,
union lp_type src_type, union lp_type src_type,
struct lp_build_mask_context *mask, struct lp_build_mask_context *mask,
LLVMValueRef src, LLVMValueRef src,
@ -142,10 +141,10 @@ generate_depth(struct llvmpipe_context *lp,
const struct util_format_description *format_desc; const struct util_format_description *format_desc;
union lp_type dst_type; union lp_type dst_type;
if(!lp->framebuffer.zsbuf) if(!key->depth.enabled)
return; return;
format_desc = util_format_description(lp->framebuffer.zsbuf->format); format_desc = util_format_description(key->zsbuf_format);
assert(format_desc); assert(format_desc);
/* Pick the depth type. */ /* Pick the depth type. */
@ -165,7 +164,7 @@ generate_depth(struct llvmpipe_context *lp,
#endif #endif
lp_build_depth_test(builder, lp_build_depth_test(builder,
state, &key->depth,
dst_type, dst_type,
format_desc, format_desc,
mask, mask,
@ -212,14 +211,13 @@ generate_fs(struct llvmpipe_context *lp,
lp_build_mask_begin(&mask, builder, type, *pmask); lp_build_mask_begin(&mask, builder, type, *pmask);
early_depth_test = early_depth_test =
lp->depth_stencil->depth.enabled && key->depth.enabled &&
lp->framebuffer.zsbuf && !key->alpha.enabled &&
!lp->depth_stencil->alpha.enabled && !shader->info.uses_kill &&
!lp->fs->info.uses_kill && !shader->info.writes_z;
!lp->fs->info.writes_z;
if(early_depth_test) if(early_depth_test)
generate_depth(lp, builder, &key->depth, generate_depth(builder, key,
type, &mask, type, &mask,
z, depth_ptr); z, depth_ptr);
@ -268,7 +266,7 @@ generate_fs(struct llvmpipe_context *lp,
} }
if(!early_depth_test) if(!early_depth_test)
generate_depth(lp, builder, &key->depth, generate_depth(builder, key,
type, &mask, type, &mask,
z, depth_ptr); z, depth_ptr);
@ -679,7 +677,11 @@ make_variant_key(struct llvmpipe_context *lp,
memset(key, 0, sizeof *key); memset(key, 0, sizeof *key);
memcpy(&key->depth, &lp->depth_stencil->depth, sizeof key->depth); if(lp->framebuffer.zsbuf &&
lp->depth_stencil->depth.enabled) {
key->zsbuf_format = lp->framebuffer.zsbuf->format;
memcpy(&key->depth, &lp->depth_stencil->depth, sizeof key->depth);
}
key->alpha.enabled = lp->depth_stencil->alpha.enabled; key->alpha.enabled = lp->depth_stencil->alpha.enabled;
if(key->alpha.enabled) if(key->alpha.enabled)