fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 15:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv/ac: add support for multi sample image coords

Browse source 
This just adds the nir->llvm support, enabling
the extension causes some failures on llvm 3.9 at least,
but this code seems fine.

NIR passes the sampler in src[1].x, and we LLVM/SI requires
it as the last parameters in the coords (coord[2] for 2D,
coord[3] for 2DArray).

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-12-30 14:24:10 +10:00
parent 41b1d9a558
commit ada66480b2
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/amd/common/ac_nir_to_llvm.c
View file

@ -2386,12 +2386,16 @@ static int image_type_to_components_count(enum glsl_sampler_dim dim, bool array)
return array ? 2 : 1; return array ? 2 : 1;
case GLSL_SAMPLER_DIM_2D: case GLSL_SAMPLER_DIM_2D:
return array ? 3 : 2; return array ? 3 : 2;
case GLSL_SAMPLER_DIM_MS:
return array ? 4 : 3;
case GLSL_SAMPLER_DIM_3D: case GLSL_SAMPLER_DIM_3D:
case GLSL_SAMPLER_DIM_CUBE: case GLSL_SAMPLER_DIM_CUBE:
return 3; return 3;
case GLSL_SAMPLER_DIM_RECT: case GLSL_SAMPLER_DIM_RECT:
case GLSL_SAMPLER_DIM_SUBPASS: case GLSL_SAMPLER_DIM_SUBPASS:
return 2; return 2;
case GLSL_SAMPLER_DIM_SUBPASS_MS:
return 3;
default: default:
break; break;
} }
@ -2413,7 +2417,11 @@ static LLVMValueRef get_image_coords(struct nir_to_llvm_context *ctx,
}; };
LLVMValueRef res; LLVMValueRef res;
int count; int count;
count = image_type_to_components_count(glsl_get_sampler_dim(type), enum glsl_sampler_dim dim = glsl_get_sampler_dim(type);
bool is_ms = (dim == GLSL_SAMPLER_DIM_MS ||
dim == GLSL_SAMPLER_DIM_SUBPASS_MS);
count = image_type_to_components_count(dim,
glsl_sampler_type_is_array(type)); glsl_sampler_type_is_array(type));
if (count == 1) { if (count == 1) {
@ -2423,6 +2431,8 @@ static LLVMValueRef get_image_coords(struct nir_to_llvm_context *ctx,
res = src0; res = src0;
} else { } else {
int chan; int chan;
if (is_ms)
count--;
for (chan = 0; chan < count; ++chan) { for (chan = 0; chan < count; ++chan) {
coords[chan] = LLVMBuildExtractElement(ctx->builder, src0, masks[chan], ""); coords[chan] = LLVMBuildExtractElement(ctx->builder, src0, masks[chan], "");
} }
@ -2431,6 +2441,11 @@ static LLVMValueRef get_image_coords(struct nir_to_llvm_context *ctx,
for (chan = 0; chan < count; ++chan) for (chan = 0; chan < count; ++chan)
coords[chan] = LLVMBuildAdd(ctx->builder, coords[chan], LLVMBuildFPToUI(ctx->builder, ctx->frag_pos[chan], ctx->i32, ""), ""); coords[chan] = LLVMBuildAdd(ctx->builder, coords[chan], LLVMBuildFPToUI(ctx->builder, ctx->frag_pos[chan], ctx->i32, ""), "");
} }
if (is_ms) {
coords[count] = llvm_extract_elem(ctx, get_src(ctx, instr->src[1]), 0);
count++;
}
if (count == 3) { if (count == 3) {
coords[3] = LLVMGetUndef(ctx->i32); coords[3] = LLVMGetUndef(ctx->i32);
count = 4; count = 4;