#include "util/u_simple_shaders.h"
#include "util/u_debug.h"
#include "util/u_memory.h"
+#include "util/u_string.h"
#include "tgsi/tgsi_dump.h"
#include "tgsi/tgsi_strings.h"
#include "tgsi/tgsi_ureg.h"
"MOV OUT[0], IN[0]\n"
"MOV OUT[1], IN[1]\n"
- "MOV OUT[2], SV[0]\n"
+ "MOV OUT[2].x, SV[0].xxxx\n"
"END\n";
struct tgsi_token tokens[1000];
struct pipe_shader_state state;
return pipe->create_gs_state(pipe, &state);
}
+static void
+ureg_load_tex(struct ureg_program *ureg, struct ureg_dst out,
+ struct ureg_src coord, struct ureg_src sampler,
+ unsigned tex_target, bool load_level_zero, bool use_txf)
+{
+ if (use_txf) {
+ struct ureg_dst temp = ureg_DECL_temporary(ureg);
+
+ ureg_F2I(ureg, temp, coord);
+
+ if (load_level_zero)
+ ureg_TXF_LZ(ureg, out, tex_target, ureg_src(temp), sampler);
+ else
+ ureg_TXF(ureg, out, tex_target, ureg_src(temp), sampler);
+ } else {
+ if (load_level_zero)
+ ureg_TEX_LZ(ureg, out, tex_target, coord, sampler);
+ else
+ ureg_TEX(ureg, out, tex_target, coord, sampler);
+ }
+}
+
/**
* Make simple fragment texture shader:
* IMM {0,0,0,1} // (if writemask != 0xf)
- * MOV OUT[0], IMM[0] // (if writemask != 0xf)
- * TEX OUT[0].writemask, IN[0], SAMP[0], 2D;
+ * MOV TEMP[0], IMM[0] // (if writemask != 0xf)
+ * TEX TEMP[0].writemask, IN[0], SAMP[0], 2D;
+ * .. optional SINT <-> UINT clamping ..
+ * MOV OUT[0], TEMP[0]
* END;
*
* \param tex_target one of PIPE_TEXTURE_x
unsigned tex_target,
unsigned interp_mode,
unsigned writemask,
- enum tgsi_return_type stype)
+ enum tgsi_return_type stype,
+ enum tgsi_return_type dtype,
+ bool load_level_zero,
+ bool use_txf)
{
struct ureg_program *ureg;
struct ureg_src sampler;
struct ureg_src tex;
+ struct ureg_dst temp;
struct ureg_dst out;
+ assert((stype == TGSI_RETURN_TYPE_FLOAT) == (dtype == TGSI_RETURN_TYPE_FLOAT));
assert(interp_mode == TGSI_INTERPOLATE_LINEAR ||
interp_mode == TGSI_INTERPOLATE_PERSPECTIVE);
TGSI_SEMANTIC_COLOR,
0 );
+ temp = ureg_DECL_temporary(ureg);
+
if (writemask != TGSI_WRITEMASK_XYZW) {
struct ureg_src imm = ureg_imm4f( ureg, 0, 0, 0, 1 );
if (tex_target == TGSI_TEXTURE_BUFFER)
ureg_TXF(ureg,
- ureg_writemask(out, writemask),
+ ureg_writemask(temp, writemask),
tex_target, tex, sampler);
else
- ureg_TEX(ureg,
- ureg_writemask(out, writemask),
- tex_target, tex, sampler);
+ ureg_load_tex(ureg, ureg_writemask(temp, writemask), tex, sampler,
+ tex_target, load_level_zero, use_txf);
+
+ if (stype != dtype) {
+ if (stype == TGSI_RETURN_TYPE_SINT) {
+ assert(dtype == TGSI_RETURN_TYPE_UINT);
+
+ ureg_IMAX(ureg, temp, ureg_src(temp), ureg_imm1i(ureg, 0));
+ } else {
+ assert(stype == TGSI_RETURN_TYPE_UINT);
+ assert(dtype == TGSI_RETURN_TYPE_SINT);
+
+ ureg_UMIN(ureg, temp, ureg_src(temp), ureg_imm1u(ureg, (1u << 31) - 1));
+ }
+ }
+
+ ureg_MOV(ureg, out, ureg_src(temp));
ureg_END( ureg );
void *
util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target,
unsigned interp_mode,
- enum tgsi_return_type stype)
+ enum tgsi_return_type stype,
+ enum tgsi_return_type dtype,
+ bool load_level_zero,
+ bool use_txf)
{
return util_make_fragment_tex_shader_writemask( pipe,
tex_target,
interp_mode,
TGSI_WRITEMASK_XYZW,
- stype );
+ stype, dtype, load_level_zero,
+ use_txf);
}
void *
util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe,
unsigned tex_target,
- unsigned interp_mode)
+ unsigned interp_mode,
+ bool load_level_zero,
+ bool use_txf)
{
struct ureg_program *ureg;
struct ureg_src sampler;
ureg_MOV( ureg, out, imm );
- ureg_TEX( ureg,
- ureg_writemask(depth, TGSI_WRITEMASK_Z),
- tex_target, tex, sampler );
+ ureg_load_tex(ureg, ureg_writemask(depth, TGSI_WRITEMASK_Z), tex, sampler,
+ tex_target, load_level_zero, use_txf);
ureg_END( ureg );
return ureg_create_shader_and_destroy( ureg, pipe );
void *
util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe,
unsigned tex_target,
- unsigned interp_mode)
+ unsigned interp_mode,
+ bool load_level_zero,
+ bool use_txf)
{
struct ureg_program *ureg;
struct ureg_src depth_sampler, stencil_sampler;
ureg_MOV( ureg, out, imm );
- ureg_TEX( ureg,
- ureg_writemask(depth, TGSI_WRITEMASK_Z),
- tex_target, tex, depth_sampler );
- ureg_TEX( ureg,
- ureg_writemask(stencil, TGSI_WRITEMASK_Y),
- tex_target, tex, stencil_sampler );
+ ureg_load_tex(ureg, ureg_writemask(depth, TGSI_WRITEMASK_Z), tex,
+ depth_sampler, tex_target, load_level_zero, use_txf);
+ ureg_load_tex(ureg, ureg_writemask(stencil, TGSI_WRITEMASK_Y), tex,
+ stencil_sampler, tex_target, load_level_zero, use_txf);
ureg_END( ureg );
return ureg_create_shader_and_destroy( ureg, pipe );
void *
util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe,
unsigned tex_target,
- unsigned interp_mode)
+ unsigned interp_mode,
+ bool load_level_zero,
+ bool use_txf)
{
struct ureg_program *ureg;
struct ureg_src stencil_sampler;
ureg_MOV( ureg, out, imm );
- ureg_TEX( ureg,
- ureg_writemask(stencil, TGSI_WRITEMASK_Y),
- tex_target, tex, stencil_sampler );
+ ureg_load_tex(ureg, ureg_writemask(stencil, TGSI_WRITEMASK_Y), tex,
+ stencil_sampler, tex_target, load_level_zero, use_txf);
ureg_END( ureg );
return ureg_create_shader_and_destroy( ureg, pipe );
static void *
util_make_fs_blit_msaa_gen(struct pipe_context *pipe,
- unsigned tgsi_tex,
+ enum tgsi_texture_type tgsi_tex,
const char *samp_type,
const char *output_semantic,
- const char *output_mask)
+ const char *output_mask,
+ const char *conversion_decl,
+ const char *conversion)
{
static const char shader_templ[] =
"FRAG\n"
"DCL SVIEW[0], %s, %s\n"
"DCL OUT[0], %s\n"
"DCL TEMP[0]\n"
+ "%s"
"F2U TEMP[0], IN[0]\n"
- "TXF OUT[0]%s, TEMP[0], SAMP[0], %s\n"
+ "TXF TEMP[0], TEMP[0], SAMP[0], %s\n"
+ "%s"
+ "MOV OUT[0]%s, TEMP[0]\n"
"END\n";
const char *type = tgsi_texture_names[tgsi_tex];
assert(tgsi_tex == TGSI_TEXTURE_2D_MSAA ||
tgsi_tex == TGSI_TEXTURE_2D_ARRAY_MSAA);
- sprintf(text, shader_templ, type, samp_type,
- output_semantic, output_mask, type);
+ util_snprintf(text, sizeof(text), shader_templ, type, samp_type,
+ output_semantic, conversion_decl, type, conversion, output_mask);
if (!tgsi_text_translate(text, tokens, ARRAY_SIZE(tokens))) {
puts(text);
*/
void *
util_make_fs_blit_msaa_color(struct pipe_context *pipe,
- unsigned tgsi_tex,
- enum tgsi_return_type stype)
+ enum tgsi_texture_type tgsi_tex,
+ enum tgsi_return_type stype,
+ enum tgsi_return_type dtype)
{
const char *samp_type;
+ const char *conversion_decl = "";
+ const char *conversion = "";
- if (stype == TGSI_RETURN_TYPE_UINT)
+ if (stype == TGSI_RETURN_TYPE_UINT) {
samp_type = "UINT";
- else if (stype == TGSI_RETURN_TYPE_SINT)
+
+ if (dtype == TGSI_RETURN_TYPE_SINT) {
+ conversion_decl = "IMM[0] UINT32 {2147483647, 0, 0, 0}\n";
+ conversion = "UMIN TEMP[0], TEMP[0], IMM[0].xxxx\n";
+ }
+ } else if (stype == TGSI_RETURN_TYPE_SINT) {
samp_type = "SINT";
- else
+
+ if (dtype == TGSI_RETURN_TYPE_UINT) {
+ conversion_decl = "IMM[0] INT32 {0, 0, 0, 0}\n";
+ conversion = "IMAX TEMP[0], TEMP[0], IMM[0].xxxx\n";
+ }
+ } else {
+ assert(dtype == TGSI_RETURN_TYPE_FLOAT);
samp_type = "FLOAT";
+ }
return util_make_fs_blit_msaa_gen(pipe, tgsi_tex, samp_type,
- "COLOR[0]", "");
+ "COLOR[0]", "", conversion_decl,
+ conversion);
}
*/
void *
util_make_fs_blit_msaa_depth(struct pipe_context *pipe,
- unsigned tgsi_tex)
+ enum tgsi_texture_type tgsi_tex)
{
return util_make_fs_blit_msaa_gen(pipe, tgsi_tex, "FLOAT",
- "POSITION", ".z");
+ "POSITION", ".z", "", "");
}
*/
void *
util_make_fs_blit_msaa_stencil(struct pipe_context *pipe,
- unsigned tgsi_tex)
+ enum tgsi_texture_type tgsi_tex)
{
return util_make_fs_blit_msaa_gen(pipe, tgsi_tex, "UINT",
- "STENCIL", ".y");
+ "STENCIL", ".y", "", "");
}
*/
void *
util_make_fs_blit_msaa_depthstencil(struct pipe_context *pipe,
- unsigned tgsi_tex)
+ enum tgsi_texture_type tgsi_tex)
{
static const char shader_templ[] =
"FRAG\n"
void *
util_make_fs_msaa_resolve(struct pipe_context *pipe,
- unsigned tgsi_tex, unsigned nr_samples,
+ enum tgsi_texture_type tgsi_tex, unsigned nr_samples,
enum tgsi_return_type stype)
{
struct ureg_program *ureg;
void *
util_make_fs_msaa_resolve_bilinear(struct pipe_context *pipe,
- unsigned tgsi_tex, unsigned nr_samples,
+ enum tgsi_texture_type tgsi_tex,
+ unsigned nr_samples,
enum tgsi_return_type stype)
{
struct ureg_program *ureg;
}
/* EMIT IMM[0] */
- ureg_insn(ureg, TGSI_OPCODE_EMIT, NULL, 0, &imm, 1);
+ ureg_insn(ureg, TGSI_OPCODE_EMIT, NULL, 0, &imm, 1, 0);
/* END */
ureg_END(ureg);
projects / mesa.git / blobdiff