#include "glsl/ir.h"
#include "glsl/ir_builder.h"
+#include "program/prog_instruction.h"
+#include "brw_context.h"
using namespace ir_builder;
class lower_texture_grad_visitor : public ir_hierarchical_visitor {
public:
- lower_texture_grad_visitor()
+ lower_texture_grad_visitor(bool has_sample_d_c)
+ : has_sample_d_c(has_sample_d_c)
{
progress = false;
}
bool progress;
+ bool has_sample_d_c;
private:
void emit(ir_variable *, ir_rvalue *);
break;
default:
assert(!"Should not get here: invalid sampler dimensionality");
+ dims = 2;
}
if (type->sampler_array)
if (ir->op != ir_txd || !ir->shadow_comparitor)
return visit_continue;
- /* Cubes are broken. Avoid assertion failures when swizzling. */
- if (ir->sampler->type->sampler_dimensionality == GLSL_SAMPLER_DIM_CUBE)
+ /* Lower textureGrad() with samplerCubeShadow even if we have the sample_d_c
+ * message. GLSL provides gradients for the 'r' coordinate. Unfortunately:
+ *
+ * From the Ivybridge PRM, Volume 4, Part 1, sample_d message description:
+ * "The r coordinate contains the faceid, and the r gradients are ignored
+ * by hardware."
+ *
+ * We likely need to do a similar treatment for samplerCube and
+ * samplerCubeArray, but we have insufficient testing for that at the moment.
+ */
+ bool need_lowering = !has_sample_d_c ||
+ ir->sampler->type->sampler_dimensionality == GLSL_SAMPLER_DIM_CUBE;
+
+ if (!need_lowering)
return visit_continue;
void *mem_ctx = ralloc_parent(ir);
txs->lod_info.lod = new(mem_ctx) ir_constant(0);
ir_variable *size =
new(mem_ctx) ir_variable(grad_type, "size", ir_var_temporary);
- emit(size, expr(ir_unop_i2f,
- swizzle_for_size(txs, grad_type->vector_elements)));
+ if (ir->sampler->type->sampler_dimensionality == GLSL_SAMPLER_DIM_CUBE) {
+ base_ir->insert_before(size);
+ base_ir->insert_before(assign(size, expr(ir_unop_i2f, txs), WRITEMASK_XY));
+ base_ir->insert_before(assign(size, new(mem_ctx) ir_constant(1.0f), WRITEMASK_Z));
+ } else {
+ emit(size, expr(ir_unop_i2f,
+ swizzle_for_size(txs, grad_type->vector_elements)));
+ }
/* Scale the gradients by width and height. Effectively, the incoming
* gradients are s'(x,y), t'(x,y), and r'(x,y) from equation 3.19 in the
extern "C" {
bool
-brw_lower_texture_gradients(struct exec_list *instructions)
+brw_lower_texture_gradients(struct brw_context *brw,
+ struct exec_list *instructions)
{
- lower_texture_grad_visitor v;
+ bool has_sample_d_c = brw->gen >= 8 || brw->is_haswell;
+ lower_texture_grad_visitor v(has_sample_d_c);
visit_list_elements(&v, instructions);