llvmpipe: Update for changes in master.
This commit is contained in:
parent
6818eb9b90
commit
f04ce6276b
|
@ -255,15 +255,15 @@ emit_tex( struct lp_build_tgsi_soa_context *bld,
|
||||||
|
|
||||||
switch (inst->InstructionExtTexture.Texture) {
|
switch (inst->InstructionExtTexture.Texture) {
|
||||||
case TGSI_TEXTURE_1D:
|
case TGSI_TEXTURE_1D:
|
||||||
case TGSI_TEXTURE_SHADOW1D:
|
|
||||||
num_coords = 1;
|
num_coords = 1;
|
||||||
break;
|
break;
|
||||||
case TGSI_TEXTURE_2D:
|
case TGSI_TEXTURE_2D:
|
||||||
case TGSI_TEXTURE_RECT:
|
case TGSI_TEXTURE_RECT:
|
||||||
case TGSI_TEXTURE_SHADOW2D:
|
|
||||||
case TGSI_TEXTURE_SHADOWRECT:
|
|
||||||
num_coords = 2;
|
num_coords = 2;
|
||||||
break;
|
break;
|
||||||
|
case TGSI_TEXTURE_SHADOW1D:
|
||||||
|
case TGSI_TEXTURE_SHADOW2D:
|
||||||
|
case TGSI_TEXTURE_SHADOWRECT:
|
||||||
case TGSI_TEXTURE_3D:
|
case TGSI_TEXTURE_3D:
|
||||||
case TGSI_TEXTURE_CUBE:
|
case TGSI_TEXTURE_CUBE:
|
||||||
num_coords = 3;
|
num_coords = 3;
|
||||||
|
@ -1167,7 +1167,7 @@ emit_instruction(
|
||||||
return 0;
|
return 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TGSI_OPCODE_LOOP:
|
case TGSI_OPCODE_BGNFOR:
|
||||||
return 0;
|
return 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1183,7 +1183,7 @@ emit_instruction(
|
||||||
return 0;
|
return 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TGSI_OPCODE_ENDLOOP:
|
case TGSI_OPCODE_ENDFOR:
|
||||||
return 0;
|
return 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -48,11 +48,6 @@
|
||||||
/* Simple, maximally packed layout.
|
/* Simple, maximally packed layout.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static unsigned minify( unsigned d )
|
|
||||||
{
|
|
||||||
return MAX2(1, d>>1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Conventional allocation path for non-display textures:
|
/* Conventional allocation path for non-display textures:
|
||||||
*/
|
*/
|
||||||
|
@ -102,6 +97,7 @@ llvmpipe_displaytarget_layout(struct pipe_screen *screen,
|
||||||
{
|
{
|
||||||
unsigned usage = (PIPE_BUFFER_USAGE_CPU_READ_WRITE |
|
unsigned usage = (PIPE_BUFFER_USAGE_CPU_READ_WRITE |
|
||||||
PIPE_BUFFER_USAGE_GPU_READ_WRITE);
|
PIPE_BUFFER_USAGE_GPU_READ_WRITE);
|
||||||
|
unsigned tex_usage = lpt->base.tex_usage;
|
||||||
|
|
||||||
pf_get_block(lpt->base.format, &lpt->base.block);
|
pf_get_block(lpt->base.format, &lpt->base.block);
|
||||||
lpt->base.nblocksx[0] = pf_get_nblocksx(&lpt->base.block, lpt->base.width[0]);
|
lpt->base.nblocksx[0] = pf_get_nblocksx(&lpt->base.block, lpt->base.width[0]);
|
||||||
|
@ -112,6 +108,7 @@ llvmpipe_displaytarget_layout(struct pipe_screen *screen,
|
||||||
lpt->base.height[0],
|
lpt->base.height[0],
|
||||||
lpt->base.format,
|
lpt->base.format,
|
||||||
usage,
|
usage,
|
||||||
|
tex_usage,
|
||||||
&lpt->stride[0]);
|
&lpt->stride[0]);
|
||||||
|
|
||||||
return lpt->buffer != NULL;
|
return lpt->buffer != NULL;
|
||||||
|
@ -139,7 +136,8 @@ llvmpipe_texture_create(struct pipe_screen *screen,
|
||||||
if(lpt->base.format == PIPE_FORMAT_Z16_UNORM)
|
if(lpt->base.format == PIPE_FORMAT_Z16_UNORM)
|
||||||
lpt->base.format = PIPE_FORMAT_Z32_UNORM;
|
lpt->base.format = PIPE_FORMAT_Z32_UNORM;
|
||||||
|
|
||||||
if (lpt->base.tex_usage & PIPE_TEXTURE_USAGE_DISPLAY_TARGET) {
|
if (lpt->base.tex_usage & (PIPE_TEXTURE_USAGE_DISPLAY_TARGET |
|
||||||
|
PIPE_TEXTURE_USAGE_PRIMARY)) {
|
||||||
if (!llvmpipe_displaytarget_layout(screen, lpt))
|
if (!llvmpipe_displaytarget_layout(screen, lpt))
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
|
@ -220,7 +220,7 @@ lp_flush_tile_cache(struct llvmpipe_tile_cache *tc)
|
||||||
if(!dst)
|
if(!dst)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
pipe_fill_rect(dst, &pt->block, pt->stride,
|
util_fill_rect(dst, &pt->block, pt->stride,
|
||||||
x, y, tw, th,
|
x, y, tw, th,
|
||||||
tc->clear_val);
|
tc->clear_val);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue