#include "main/context.h"
#include "main/teximage.h"
#include "main/blend.h"
+#include "main/bufferobj.h"
+#include "main/enums.h"
#include "main/fbobject.h"
+#include "main/image.h"
#include "main/renderbuffer.h"
#include "main/glformats.h"
#include "brw_defines.h"
#include "brw_meta_util.h"
#include "brw_state.h"
+#include "intel_buffer_objects.h"
#include "intel_fbo.h"
#include "common/gen_debug.h"
uint32_t *kernel_out, void *prog_data_out)
{
struct brw_context *brw = blorp->driver_ctx;
- return brw_search_cache(&brw->cache, BRW_CACHE_BLORP_PROG,
- key, key_size, kernel_out, prog_data_out);
+ return brw_search_cache(&brw->cache, BRW_CACHE_BLORP_PROG, key, key_size,
+ kernel_out, prog_data_out, true);
}
static bool
void
brw_blorp_init(struct brw_context *brw)
{
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
+
blorp_init(&brw->blorp, brw, &brw->isl_dev);
brw->blorp.compiler = brw->screen->compiler;
- switch (brw->gen) {
+ switch (devinfo->gen) {
case 4:
- if (brw->is_g4x) {
+ if (devinfo->is_g4x) {
brw->blorp.exec = gen45_blorp_exec;
} else {
brw->blorp.exec = gen4_blorp_exec;
brw->blorp.exec = gen5_blorp_exec;
break;
case 6:
- brw->blorp.mocs.tex = 0;
- brw->blorp.mocs.rb = 0;
- brw->blorp.mocs.vb = 0;
brw->blorp.exec = gen6_blorp_exec;
break;
case 7:
- brw->blorp.mocs.tex = GEN7_MOCS_L3;
- brw->blorp.mocs.rb = GEN7_MOCS_L3;
- brw->blorp.mocs.vb = GEN7_MOCS_L3;
- if (brw->is_haswell) {
+ if (devinfo->is_haswell) {
brw->blorp.exec = gen75_blorp_exec;
} else {
brw->blorp.exec = gen7_blorp_exec;
}
break;
case 8:
- brw->blorp.mocs.tex = BDW_MOCS_WB;
- brw->blorp.mocs.rb = BDW_MOCS_PTE;
- brw->blorp.mocs.vb = BDW_MOCS_WB;
brw->blorp.exec = gen8_blorp_exec;
break;
case 9:
- brw->blorp.mocs.tex = SKL_MOCS_WB;
- brw->blorp.mocs.rb = SKL_MOCS_PTE;
- brw->blorp.mocs.vb = SKL_MOCS_WB;
brw->blorp.exec = gen9_blorp_exec;
break;
case 10:
- brw->blorp.mocs.tex = CNL_MOCS_WB;
- brw->blorp.mocs.rb = CNL_MOCS_PTE;
- brw->blorp.mocs.vb = CNL_MOCS_WB;
brw->blorp.exec = gen10_blorp_exec;
break;
+ case 11:
+ brw->blorp.exec = gen11_blorp_exec;
+ break;
+
default:
unreachable("Invalid gen");
}
static void
blorp_surf_for_miptree(struct brw_context *brw,
struct blorp_surf *surf,
- struct intel_mipmap_tree *mt,
+ const struct intel_mipmap_tree *mt,
+ enum isl_aux_usage aux_usage,
bool is_render_target,
- bool wants_resolve,
- uint32_t safe_aux_usage,
unsigned *level,
unsigned start_layer, unsigned num_layers,
struct isl_surf tmp_surfs[1])
{
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
+
if (mt->surf.msaa_layout == ISL_MSAA_LAYOUT_ARRAY) {
const unsigned num_samples = mt->surf.samples;
for (unsigned i = 0; i < num_layers; i++) {
intel_miptree_check_level_layer(mt, *level, start_layer + i);
}
- surf->surf = &mt->surf;
- surf->addr = (struct blorp_address) {
- .buffer = mt->bo,
- .offset = mt->offset,
- .read_domains = is_render_target ? I915_GEM_DOMAIN_RENDER :
- I915_GEM_DOMAIN_SAMPLER,
- .write_domain = is_render_target ? I915_GEM_DOMAIN_RENDER : 0,
+ *surf = (struct blorp_surf) {
+ .surf = &mt->surf,
+ .addr = (struct blorp_address) {
+ .buffer = mt->bo,
+ .offset = mt->offset,
+ .reloc_flags = is_render_target ? EXEC_OBJECT_WRITE : 0,
+ .mocs = brw_get_bo_mocs(devinfo, mt->bo),
+ },
+ .aux_usage = aux_usage,
+ .tile_x_sa = mt->level[*level].level_x,
+ .tile_y_sa = mt->level[*level].level_y,
};
- surf->aux_usage = intel_miptree_get_aux_isl_usage(brw, mt);
-
- struct isl_surf *aux_surf = NULL;
- if (mt->mcs_buf)
- aux_surf = &mt->mcs_buf->surf;
- else if (mt->hiz_buf)
- aux_surf = &mt->hiz_buf->surf;
-
- if (wants_resolve) {
- bool supports_aux = surf->aux_usage != ISL_AUX_USAGE_NONE &&
- (safe_aux_usage & (1 << surf->aux_usage));
- intel_miptree_prepare_access(brw, mt, *level, 1, start_layer, num_layers,
- supports_aux, supports_aux);
- if (!supports_aux)
- surf->aux_usage = ISL_AUX_USAGE_NONE;
-
- if (is_render_target) {
- intel_miptree_finish_write(brw, mt, *level, start_layer, num_layers,
- supports_aux);
- }
- }
-
if (surf->aux_usage == ISL_AUX_USAGE_HIZ &&
!intel_miptree_level_has_hiz(mt, *level))
surf->aux_usage = ISL_AUX_USAGE_NONE;
/* We only really need a clear color if we also have an auxiliary
* surface. Without one, it does nothing.
*/
- surf->clear_color = mt->fast_clear_color;
+ surf->clear_color =
+ intel_miptree_get_clear_color(devinfo, mt, mt->surf.format,
+ !is_render_target, (struct brw_bo **)
+ &surf->clear_color_addr.buffer,
+ &surf->clear_color_addr.offset);
- surf->aux_surf = aux_surf;
+ surf->aux_surf = &mt->aux_buf->surf;
surf->aux_addr = (struct blorp_address) {
- .read_domains = is_render_target ? I915_GEM_DOMAIN_RENDER :
- I915_GEM_DOMAIN_SAMPLER,
- .write_domain = is_render_target ? I915_GEM_DOMAIN_RENDER : 0,
+ .reloc_flags = is_render_target ? EXEC_OBJECT_WRITE : 0,
+ .mocs = surf->addr.mocs,
};
- if (mt->mcs_buf) {
- surf->aux_addr.buffer = mt->mcs_buf->bo;
- surf->aux_addr.offset = mt->mcs_buf->offset;
- } else {
- assert(surf->aux_usage == ISL_AUX_USAGE_HIZ);
-
- surf->aux_addr.buffer = mt->hiz_buf->bo;
- surf->aux_addr.offset = mt->hiz_buf->offset;
- }
+ surf->aux_addr.buffer = mt->aux_buf->bo;
+ surf->aux_addr.offset = mt->aux_buf->offset;
} else {
surf->aux_addr = (struct blorp_address) {
.buffer = NULL,
*level -= mt->first_level;
}
+static bool
+brw_blorp_supports_dst_format(struct brw_context *brw, mesa_format format)
+{
+ /* If it's renderable, it's definitely supported. */
+ if (brw->mesa_format_supports_render[format])
+ return true;
+
+ /* BLORP can't compress anything */
+ if (_mesa_is_format_compressed(format))
+ return false;
+
+ /* No exotic formats such as GL_LUMINANCE_ALPHA */
+ if (_mesa_get_format_bits(format, GL_RED_BITS) == 0 &&
+ _mesa_get_format_bits(format, GL_DEPTH_BITS) == 0 &&
+ _mesa_get_format_bits(format, GL_STENCIL_BITS) == 0)
+ return false;
+
+ return true;
+}
+
static enum isl_format
brw_blorp_to_isl_format(struct brw_context *brw, mesa_format format,
bool is_render_target)
return ISL_FORMAT_R32_FLOAT;
case MESA_FORMAT_Z_UNORM16:
return ISL_FORMAT_R16_UNORM;
- default: {
+ default:
if (is_render_target) {
- assert(brw->mesa_format_supports_render[format]);
- return brw->mesa_to_isl_render_format[format];
+ assert(brw_blorp_supports_dst_format(brw, format));
+ if (brw->mesa_format_supports_render[format]) {
+ return brw->mesa_to_isl_render_format[format];
+ } else {
+ return brw_isl_format_for_mesa_format(format);
+ }
} else {
+ /* Some destinations (is_render_target == true) are supported by
+ * blorp even though we technically can't render to them.
+ */
return brw_isl_format_for_mesa_format(format);
}
- break;
- }
}
}
float src_x1, float src_y1,
float dst_x0, float dst_y0,
float dst_x1, float dst_y1,
- GLenum filter, bool mirror_x, bool mirror_y,
+ GLenum gl_filter, bool mirror_x, bool mirror_y,
bool decode_srgb, bool encode_srgb)
{
- DBG("%s from %dx %s mt %p %d %d (%f,%f) (%f,%f)"
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
+
+ DBG("%s from %dx %s mt %p %d %d (%f,%f) (%f,%f) "
"to %dx %s mt %p %d %d (%f,%f) (%f,%f) (flip %d,%d)\n",
__func__,
src_mt->surf.samples, _mesa_get_format_name(src_mt->format), src_mt,
* shouldn't affect rendering correctness, since the destination format is
* R32_FLOAT, so only the contents of the red channel matters.
*/
- if (brw->gen == 6 &&
+ if (devinfo->gen == 6 &&
src_mt->surf.samples > 1 && dst_mt->surf.samples <= 1 &&
src_mt->format == dst_mt->format &&
(dst_format == MESA_FORMAT_L_FLOAT32 ||
src_format = dst_format = MESA_FORMAT_R_FLOAT32;
}
- uint32_t src_usage_flags = (1 << ISL_AUX_USAGE_MCS);
- if (src_format == src_mt->format)
- src_usage_flags |= (1 << ISL_AUX_USAGE_CCS_E);
-
- uint32_t dst_usage_flags = (1 << ISL_AUX_USAGE_MCS);
- if (dst_format == dst_mt->format) {
- dst_usage_flags |= (1 << ISL_AUX_USAGE_CCS_E) |
- (1 << ISL_AUX_USAGE_CCS_D);
+ enum blorp_filter blorp_filter;
+ if (fabsf(dst_x1 - dst_x0) == fabsf(src_x1 - src_x0) &&
+ fabsf(dst_y1 - dst_y0) == fabsf(src_y1 - src_y0)) {
+ if (src_mt->surf.samples > 1 && dst_mt->surf.samples <= 1) {
+ /* From the OpenGL ES 3.2 specification, section 16.2.1:
+ *
+ * "If the read framebuffer is multisampled (its effective value
+ * of SAMPLE_BUFFERS is one) and the draw framebuffer is not (its
+ * value of SAMPLE_BUFFERS is zero), the samples corresponding to
+ * each pixel location in the source are converted to a single
+ * sample before being written to the destination. The filter
+ * parameter is ignored. If the source formats are integer types
+ * or stencil values, a single sample’s value is selected for each
+ * pixel. If the source formats are floating-point or normalized
+ * types, the sample values for each pixel are resolved in an
+ * implementation-dependent manner. If the source formats are
+ * depth values, sample values are resolved in an implementation-
+ * dependent manner where the result will be between the minimum
+ * and maximum depth values in the pixel."
+ *
+ * For depth and stencil resolves, we choose to always use the value
+ * at sample 0.
+ */
+ GLenum base_format = _mesa_get_format_base_format(src_mt->format);
+ if (base_format == GL_DEPTH_COMPONENT ||
+ base_format == GL_STENCIL_INDEX ||
+ base_format == GL_DEPTH_STENCIL ||
+ _mesa_is_format_integer(src_mt->format)) {
+ /* The OpenGL ES 3.2 spec says:
+ *
+ * "If the source formats are integer types or stencil values,
+ * a single sample's value is selected for each pixel."
+ *
+ * Just take sample 0 in this case.
+ */
+ blorp_filter = BLORP_FILTER_SAMPLE_0;
+ } else {
+ blorp_filter = BLORP_FILTER_AVERAGE;
+ }
+ } else {
+ /* From the OpenGL 4.6 specification, section 18.3.1:
+ *
+ * "If the source and destination dimensions are identical, no
+ * filtering is applied."
+ *
+ * Using BLORP_FILTER_NONE will also handle the upsample case by
+ * replicating the one value in the source to all values in the
+ * destination.
+ */
+ blorp_filter = BLORP_FILTER_NONE;
+ }
+ } else if (gl_filter == GL_LINEAR ||
+ gl_filter == GL_SCALED_RESOLVE_FASTEST_EXT ||
+ gl_filter == GL_SCALED_RESOLVE_NICEST_EXT) {
+ blorp_filter = BLORP_FILTER_BILINEAR;
+ } else {
+ blorp_filter = BLORP_FILTER_NEAREST;
}
+ enum isl_format src_isl_format =
+ brw_blorp_to_isl_format(brw, src_format, false);
+ enum isl_aux_usage src_aux_usage =
+ intel_miptree_texture_aux_usage(brw, src_mt, src_isl_format);
+ /* We do format workarounds for some depth formats so we can't reliably
+ * sample with HiZ. One of these days, we should fix that.
+ */
+ if (src_aux_usage == ISL_AUX_USAGE_HIZ)
+ src_aux_usage = ISL_AUX_USAGE_NONE;
+ const bool src_clear_supported =
+ src_aux_usage != ISL_AUX_USAGE_NONE && src_mt->format == src_format;
+ intel_miptree_prepare_access(brw, src_mt, src_level, 1, src_layer, 1,
+ src_aux_usage, src_clear_supported);
+
+ enum isl_format dst_isl_format =
+ brw_blorp_to_isl_format(brw, dst_format, true);
+ enum isl_aux_usage dst_aux_usage =
+ intel_miptree_render_aux_usage(brw, dst_mt, dst_isl_format,
+ false, false);
+ const bool dst_clear_supported = dst_aux_usage != ISL_AUX_USAGE_NONE;
+ intel_miptree_prepare_access(brw, dst_mt, dst_level, 1, dst_layer, 1,
+ dst_aux_usage, dst_clear_supported);
+
struct isl_surf tmp_surfs[2];
struct blorp_surf src_surf, dst_surf;
- blorp_surf_for_miptree(brw, &src_surf, src_mt, false, true, src_usage_flags,
+ blorp_surf_for_miptree(brw, &src_surf, src_mt, src_aux_usage, false,
&src_level, src_layer, 1, &tmp_surfs[0]);
- blorp_surf_for_miptree(brw, &dst_surf, dst_mt, true, true, dst_usage_flags,
+ blorp_surf_for_miptree(brw, &dst_surf, dst_mt, dst_aux_usage, true,
&dst_level, dst_layer, 1, &tmp_surfs[1]);
struct isl_swizzle src_isl_swizzle = {
struct blorp_batch batch;
blorp_batch_init(&brw->blorp, &batch, brw, 0);
blorp_blit(&batch, &src_surf, src_level, src_layer,
- brw_blorp_to_isl_format(brw, src_format, false), src_isl_swizzle,
+ src_isl_format, src_isl_swizzle,
&dst_surf, dst_level, dst_layer,
- brw_blorp_to_isl_format(brw, dst_format, true),
- ISL_SWIZZLE_IDENTITY,
+ dst_isl_format, ISL_SWIZZLE_IDENTITY,
src_x0, src_y0, src_x1, src_y1,
dst_x0, dst_y0, dst_x1, dst_y1,
- filter, mirror_x, mirror_y);
+ blorp_filter, mirror_x, mirror_y);
blorp_batch_finish(&batch);
+
+ intel_miptree_finish_write(brw, dst_mt, dst_level, dst_layer, 1,
+ dst_aux_usage);
}
void
unsigned dst_x, unsigned dst_y,
unsigned src_width, unsigned src_height)
{
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
+
DBG("%s from %dx %s mt %p %d %d (%d,%d) %dx%d"
"to %dx %s mt %p %d %d (%d,%d)\n",
__func__,
dst_mt->surf.samples, _mesa_get_format_name(dst_mt->format), dst_mt,
dst_level, dst_layer, dst_x, dst_y);
+ enum isl_aux_usage src_aux_usage, dst_aux_usage;
+ bool src_clear_supported, dst_clear_supported;
+
+ switch (src_mt->aux_usage) {
+ case ISL_AUX_USAGE_MCS:
+ case ISL_AUX_USAGE_CCS_E:
+ src_aux_usage = src_mt->aux_usage;
+ /* Prior to gen9, fast-clear only supported 0/1 clear colors. Since
+ * we're going to re-interpret the format as an integer format possibly
+ * with a different number of components, we can't handle clear colors
+ * until gen9.
+ */
+ src_clear_supported = devinfo->gen >= 9;
+ break;
+ default:
+ src_aux_usage = ISL_AUX_USAGE_NONE;
+ src_clear_supported = false;
+ break;
+ }
+
+ switch (dst_mt->aux_usage) {
+ case ISL_AUX_USAGE_MCS:
+ case ISL_AUX_USAGE_CCS_E:
+ dst_aux_usage = dst_mt->aux_usage;
+ /* Prior to gen9, fast-clear only supported 0/1 clear colors. Since
+ * we're going to re-interpret the format as an integer format possibly
+ * with a different number of components, we can't handle clear colors
+ * until gen9.
+ */
+ dst_clear_supported = devinfo->gen >= 9;
+ break;
+ default:
+ dst_aux_usage = ISL_AUX_USAGE_NONE;
+ dst_clear_supported = false;
+ break;
+ }
+
+ intel_miptree_prepare_access(brw, src_mt, src_level, 1, src_layer, 1,
+ src_aux_usage, src_clear_supported);
+ intel_miptree_prepare_access(brw, dst_mt, dst_level, 1, dst_layer, 1,
+ dst_aux_usage, dst_clear_supported);
+
struct isl_surf tmp_surfs[2];
struct blorp_surf src_surf, dst_surf;
- blorp_surf_for_miptree(brw, &src_surf, src_mt, false, true,
- (1 << ISL_AUX_USAGE_MCS) |
- (1 << ISL_AUX_USAGE_CCS_E),
+ blorp_surf_for_miptree(brw, &src_surf, src_mt, src_aux_usage, false,
&src_level, src_layer, 1, &tmp_surfs[0]);
- blorp_surf_for_miptree(brw, &dst_surf, dst_mt, true, true,
- (1 << ISL_AUX_USAGE_MCS) |
- (1 << ISL_AUX_USAGE_CCS_E),
+ blorp_surf_for_miptree(brw, &dst_surf, dst_mt, dst_aux_usage, true,
&dst_level, dst_layer, 1, &tmp_surfs[1]);
+ /* The hardware seems to have issues with having a two different format
+ * views of the same texture in the sampler cache at the same time. It's
+ * unclear exactly what the issue is but it hurts glCopyImageSubData
+ * particularly badly because it does a lot of format reinterprets. We
+ * badly need better understanding of the issue and a better fix but this
+ * works for now and fixes CTS tests.
+ *
+ * TODO: Remove this hack!
+ */
+ brw_emit_pipe_control_flush(brw, PIPE_CONTROL_CS_STALL |
+ PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE);
+
struct blorp_batch batch;
blorp_batch_init(&brw->blorp, &batch, brw, 0);
blorp_copy(&batch, &src_surf, src_level, src_layer,
&dst_surf, dst_level, dst_layer,
src_x, src_y, dst_x, dst_y, src_width, src_height);
blorp_batch_finish(&batch);
+
+ brw_emit_pipe_control_flush(brw, PIPE_CONTROL_CS_STALL |
+ PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE);
+
+ intel_miptree_finish_write(brw, dst_mt, dst_level, dst_layer, 1,
+ dst_aux_usage);
}
+void
+brw_blorp_copy_buffers(struct brw_context *brw,
+ struct brw_bo *src_bo,
+ unsigned src_offset,
+ struct brw_bo *dst_bo,
+ unsigned dst_offset,
+ unsigned size)
+{
+ DBG("%s %d bytes from %p[%d] to %p[%d]",
+ __func__, size, src_bo, src_offset, dst_bo, dst_offset);
+
+ struct blorp_batch batch;
+ struct blorp_address src = { .buffer = src_bo, .offset = src_offset };
+ struct blorp_address dst = { .buffer = dst_bo, .offset = dst_offset };
+
+ blorp_batch_init(&brw->blorp, &batch, brw, 0);
+ blorp_buffer_copy(&batch, src, dst, size);
+ blorp_batch_finish(&batch);
+}
+
+
static struct intel_mipmap_tree *
find_miptree(GLbitfield buffer_bit, struct intel_renderbuffer *irb)
{
GLfloat dstX0, GLfloat dstY0, GLfloat dstX1, GLfloat dstY1,
GLenum filter, GLbitfield buffer_bit)
{
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
struct gl_context *ctx = &brw->ctx;
/* Sync up the state of window system buffers. We need to do this before
src_mt = find_miptree(buffer_bit, src_irb);
dst_mt = find_miptree(buffer_bit, dst_irb);
- /* We can't handle format conversions between Z24 and other formats
- * since we have to lie about the surface format. See the comments in
- * brw_blorp_surface_info::set().
- */
- if ((src_mt->format == MESA_FORMAT_Z24_UNORM_X8_UINT) !=
- (dst_mt->format == MESA_FORMAT_Z24_UNORM_X8_UINT))
- return false;
-
/* We also can't handle any combined depth-stencil formats because we
* have to reinterpret as a color format.
*/
/* Blorp doesn't support combined depth stencil which is all we have
* prior to gen6.
*/
- if (brw->gen < 6)
+ if (devinfo->gen < 6)
return false;
src_irb =
return true;
}
+static void
+apply_y_flip(int *y0, int *y1, int height)
+{
+ int tmp = height - *y0;
+ *y0 = height - *y1;
+ *y1 = tmp;
+}
+
bool
brw_blorp_copytexsubimage(struct brw_context *brw,
struct gl_renderbuffer *src_rb,
struct intel_mipmap_tree *src_mt = src_irb->mt;
struct intel_mipmap_tree *dst_mt = intel_image->mt;
- /* There is support for only up to eight samples. */
- if (src_mt->surf.samples > 8 || dst_mt->surf.samples > 8)
- return false;
-
- if (_mesa_get_format_base_format(src_rb->Format) !=
- _mesa_get_format_base_format(dst_image->TexFormat)) {
- return false;
- }
-
- /* We can't handle format conversions between Z24 and other formats since
- * we have to lie about the surface format. See the comments in
- * brw_blorp_surface_info::set().
- */
- if ((src_mt->format == MESA_FORMAT_Z24_UNORM_X8_UINT) !=
- (dst_mt->format == MESA_FORMAT_Z24_UNORM_X8_UINT)) {
- return false;
- }
-
- /* We also can't handle any combined depth-stencil formats because we
- * have to reinterpret as a color format.
+ /* We can't handle any combined depth-stencil formats because we have to
+ * reinterpret as a color format.
*/
if (_mesa_get_format_base_format(src_mt->format) == GL_DEPTH_STENCIL ||
_mesa_get_format_base_format(dst_mt->format) == GL_DEPTH_STENCIL)
return false;
- if (!brw->mesa_format_supports_render[dst_image->TexFormat])
+ if (!brw_blorp_supports_dst_format(brw, dst_image->TexFormat))
return false;
/* Source clipping shouldn't be necessary, since copytexsubimage (in
/* Account for the fact that in the system framebuffer, the origin is at
* the lower left.
*/
- bool mirror_y = false;
- if (_mesa_is_winsys_fbo(ctx->ReadBuffer)) {
- GLint tmp = src_rb->Height - srcY0;
- srcY0 = src_rb->Height - srcY1;
- srcY1 = tmp;
- mirror_y = true;
- }
+ bool mirror_y = _mesa_is_winsys_fbo(ctx->ReadBuffer);
+ if (mirror_y)
+ apply_y_flip(&srcY0, &srcY1, src_rb->Height);
/* Account for face selection and texture view MinLayer */
int dst_slice = slice + dst_image->TexObject->MinLayer + dst_image->Face;
return mask;
}
+static struct brw_bo *
+blorp_get_client_bo(struct brw_context *brw,
+ unsigned w, unsigned h, unsigned d,
+ GLenum target, GLenum format, GLenum type,
+ const void *pixels,
+ const struct gl_pixelstore_attrib *packing,
+ uint32_t *offset_out, uint32_t *row_stride_out,
+ uint32_t *image_stride_out, bool read_only)
+{
+ /* Account for SKIP_PIXELS, SKIP_ROWS, ALIGNMENT, and SKIP_IMAGES */
+ const GLuint dims = _mesa_get_texture_dimensions(target);
+ const uint32_t first_pixel = _mesa_image_offset(dims, packing, w, h,
+ format, type, 0, 0, 0);
+ const uint32_t last_pixel = _mesa_image_offset(dims, packing, w, h,
+ format, type,
+ d - 1, h - 1, w);
+ const uint32_t stride = _mesa_image_row_stride(packing, w, format, type);
+ const uint32_t cpp = _mesa_bytes_per_pixel(format, type);
+ const uint32_t size = last_pixel - first_pixel;
+
+ *row_stride_out = stride;
+ *image_stride_out = _mesa_image_image_stride(packing, w, h, format, type);
+
+ if (_mesa_is_bufferobj(packing->BufferObj)) {
+ const uint32_t offset = first_pixel + (intptr_t)pixels;
+ if (!read_only && ((offset % cpp) || (stride % cpp))) {
+ perf_debug("Bad PBO alignment; fallback to CPU mapping\n");
+ return NULL;
+ }
+
+ /* This is a user-provided PBO. We just need to get the BO out */
+ struct intel_buffer_object *intel_pbo =
+ intel_buffer_object(packing->BufferObj);
+ struct brw_bo *bo =
+ intel_bufferobj_buffer(brw, intel_pbo, offset, size, !read_only);
+
+ /* We take a reference to the BO so that the caller can just always
+ * unref without having to worry about whether it's a user PBO or one
+ * we created.
+ */
+ brw_bo_reference(bo);
+
+ *offset_out = offset;
+ return bo;
+ } else {
+ /* Someone should have already checked that there is data to upload. */
+ assert(pixels);
+
+ /* Creating a temp buffer currently only works for upload */
+ assert(read_only);
+
+ /* This is not a user-provided PBO. Instead, pixels is a pointer to CPU
+ * data which we need to copy into a BO.
+ */
+ struct brw_bo *bo =
+ brw_bo_alloc(brw->bufmgr, "tmp_tex_subimage_src", size,
+ BRW_MEMZONE_OTHER);
+ if (bo == NULL) {
+ perf_debug("intel_texsubimage: temp bo creation failed: size = %u\n",
+ size);
+ return NULL;
+ }
+
+ if (brw_bo_subdata(bo, 0, size, pixels + first_pixel)) {
+ perf_debug("intel_texsubimage: temp bo upload failed\n");
+ brw_bo_unreference(bo);
+ return NULL;
+ }
+
+ *offset_out = 0;
+ return bo;
+ }
+}
+
+/* Consider all the restrictions and determine the format of the source. */
+static mesa_format
+blorp_get_client_format(struct brw_context *brw,
+ GLenum format, GLenum type,
+ const struct gl_pixelstore_attrib *packing)
+{
+ if (brw->ctx._ImageTransferState)
+ return MESA_FORMAT_NONE;
+
+ if (packing->SwapBytes || packing->LsbFirst || packing->Invert) {
+ perf_debug("intel_texsubimage_blorp: unsupported gl_pixelstore_attrib\n");
+ return MESA_FORMAT_NONE;
+ }
+
+ if (format != GL_RED &&
+ format != GL_RG &&
+ format != GL_RGB &&
+ format != GL_BGR &&
+ format != GL_RGBA &&
+ format != GL_BGRA &&
+ format != GL_ALPHA &&
+ format != GL_RED_INTEGER &&
+ format != GL_RG_INTEGER &&
+ format != GL_RGB_INTEGER &&
+ format != GL_BGR_INTEGER &&
+ format != GL_RGBA_INTEGER &&
+ format != GL_BGRA_INTEGER) {
+ perf_debug("intel_texsubimage_blorp: %s not supported",
+ _mesa_enum_to_string(format));
+ return MESA_FORMAT_NONE;
+ }
+
+ return _mesa_tex_format_from_format_and_type(&brw->ctx, format, type);
+}
+
+static bool
+need_signed_unsigned_int_conversion(mesa_format src_format,
+ mesa_format dst_format)
+{
+ const GLenum src_type = _mesa_get_format_datatype(src_format);
+ const GLenum dst_type = _mesa_get_format_datatype(dst_format);
+ return (src_type == GL_INT && dst_type == GL_UNSIGNED_INT) ||
+ (src_type == GL_UNSIGNED_INT && dst_type == GL_INT);
+}
+
+bool
+brw_blorp_upload_miptree(struct brw_context *brw,
+ struct intel_mipmap_tree *dst_mt,
+ mesa_format dst_format,
+ uint32_t level, uint32_t x, uint32_t y, uint32_t z,
+ uint32_t width, uint32_t height, uint32_t depth,
+ GLenum target, GLenum format, GLenum type,
+ const void *pixels,
+ const struct gl_pixelstore_attrib *packing)
+{
+ const mesa_format src_format =
+ blorp_get_client_format(brw, format, type, packing);
+ if (src_format == MESA_FORMAT_NONE)
+ return false;
+
+ if (!brw->mesa_format_supports_render[dst_format]) {
+ perf_debug("intel_texsubimage: can't use %s as render target\n",
+ _mesa_get_format_name(dst_format));
+ return false;
+ }
+
+ /* This function relies on blorp_blit to upload the pixel data to the
+ * miptree. But, blorp_blit doesn't support signed to unsigned or
+ * unsigned to signed integer conversions.
+ */
+ if (need_signed_unsigned_int_conversion(src_format, dst_format))
+ return false;
+
+ uint32_t src_offset, src_row_stride, src_image_stride;
+ struct brw_bo *src_bo =
+ blorp_get_client_bo(brw, width, height, depth,
+ target, format, type, pixels, packing,
+ &src_offset, &src_row_stride,
+ &src_image_stride, true);
+ if (src_bo == NULL)
+ return false;
+
+ /* Now that source is offset to correct starting point, adjust the
+ * given dimensions to treat 1D arrays as 2D.
+ */
+ if (target == GL_TEXTURE_1D_ARRAY) {
+ assert(depth == 1);
+ assert(z == 0);
+ depth = height;
+ height = 1;
+ z = y;
+ y = 0;
+ src_image_stride = src_row_stride;
+ }
+
+ intel_miptree_check_level_layer(dst_mt, level, z + depth - 1);
+
+ bool result = false;
+
+ /* Blit slice-by-slice creating a single-slice miptree for each layer. Even
+ * in case of linear buffers hardware wants image arrays to be aligned by
+ * four rows. This way hardware only gets one image at a time and any
+ * source alignment will do.
+ */
+ for (unsigned i = 0; i < depth; ++i) {
+ struct intel_mipmap_tree *src_mt = intel_miptree_create_for_bo(
+ brw, src_bo, src_format,
+ src_offset + i * src_image_stride,
+ width, height, 1,
+ src_row_stride,
+ ISL_TILING_LINEAR, 0);
+
+ if (!src_mt) {
+ perf_debug("intel_texsubimage: miptree creation for src failed\n");
+ goto err;
+ }
+
+ /* In case exact match is needed, copy using equivalent UINT formats
+ * preventing hardware from changing presentation for SNORM -1.
+ */
+ if (src_mt->format == dst_format) {
+ brw_blorp_copy_miptrees(brw, src_mt, 0, 0,
+ dst_mt, level, z + i,
+ 0, 0, x, y, width, height);
+ } else {
+ brw_blorp_blit_miptrees(brw, src_mt, 0, 0,
+ src_format, SWIZZLE_XYZW,
+ dst_mt, level, z + i,
+ dst_format,
+ 0, 0, width, height,
+ x, y, x + width, y + height,
+ GL_NEAREST, false, false, false, false);
+ }
+
+ intel_miptree_release(&src_mt);
+ }
+
+ result = true;
+
+err:
+ brw_bo_unreference(src_bo);
+
+ return result;
+}
+
+bool
+brw_blorp_download_miptree(struct brw_context *brw,
+ struct intel_mipmap_tree *src_mt,
+ mesa_format src_format, uint32_t src_swizzle,
+ uint32_t level, uint32_t x, uint32_t y, uint32_t z,
+ uint32_t width, uint32_t height, uint32_t depth,
+ GLenum target, GLenum format, GLenum type,
+ bool y_flip, const void *pixels,
+ const struct gl_pixelstore_attrib *packing)
+{
+ const mesa_format dst_format =
+ blorp_get_client_format(brw, format, type, packing);
+ if (dst_format == MESA_FORMAT_NONE)
+ return false;
+
+ if (!brw->mesa_format_supports_render[dst_format]) {
+ perf_debug("intel_texsubimage: can't use %s as render target\n",
+ _mesa_get_format_name(dst_format));
+ return false;
+ }
+
+ /* This function relies on blorp_blit to download the pixel data from the
+ * miptree. But, blorp_blit doesn't support signed to unsigned or unsigned
+ * to signed integer conversions.
+ */
+ if (need_signed_unsigned_int_conversion(src_format, dst_format))
+ return false;
+
+ /* We can't fetch from LUMINANCE or intensity as that would require a
+ * non-trivial swizzle.
+ */
+ switch (_mesa_get_format_base_format(src_format)) {
+ case GL_LUMINANCE:
+ case GL_LUMINANCE_ALPHA:
+ case GL_INTENSITY:
+ return false;
+ default:
+ break;
+ }
+
+ /* This pass only works for PBOs */
+ assert(_mesa_is_bufferobj(packing->BufferObj));
+
+ uint32_t dst_offset, dst_row_stride, dst_image_stride;
+ struct brw_bo *dst_bo =
+ blorp_get_client_bo(brw, width, height, depth,
+ target, format, type, pixels, packing,
+ &dst_offset, &dst_row_stride,
+ &dst_image_stride, false);
+ if (dst_bo == NULL)
+ return false;
+
+ /* Now that source is offset to correct starting point, adjust the
+ * given dimensions to treat 1D arrays as 2D.
+ */
+ if (target == GL_TEXTURE_1D_ARRAY) {
+ assert(depth == 1);
+ assert(z == 0);
+ depth = height;
+ height = 1;
+ z = y;
+ y = 0;
+ dst_image_stride = dst_row_stride;
+ }
+
+ intel_miptree_check_level_layer(src_mt, level, z + depth - 1);
+
+ int y0 = y;
+ int y1 = y + height;
+ if (y_flip) {
+ apply_y_flip(&y0, &y1, minify(src_mt->surf.phys_level0_sa.height,
+ level - src_mt->first_level));
+ }
+
+ bool result = false;
+
+ /* Blit slice-by-slice creating a single-slice miptree for each layer. Even
+ * in case of linear buffers hardware wants image arrays to be aligned by
+ * four rows. This way hardware only gets one image at a time and any
+ * source alignment will do.
+ */
+ for (unsigned i = 0; i < depth; ++i) {
+ struct intel_mipmap_tree *dst_mt = intel_miptree_create_for_bo(
+ brw, dst_bo, dst_format,
+ dst_offset + i * dst_image_stride,
+ width, height, 1,
+ dst_row_stride,
+ ISL_TILING_LINEAR, 0);
+
+ if (!dst_mt) {
+ perf_debug("intel_texsubimage: miptree creation for src failed\n");
+ goto err;
+ }
+
+ /* In case exact match is needed, copy using equivalent UINT formats
+ * preventing hardware from changing presentation for SNORM -1.
+ */
+ if (dst_mt->format == src_format && !y_flip &&
+ src_swizzle == SWIZZLE_XYZW) {
+ brw_blorp_copy_miptrees(brw, src_mt, level, z + i,
+ dst_mt, 0, 0,
+ x, y, 0, 0, width, height);
+ } else {
+ brw_blorp_blit_miptrees(brw, src_mt, level, z + i,
+ src_format, src_swizzle,
+ dst_mt, 0, 0, dst_format,
+ x, y0, x + width, y1,
+ 0, 0, width, height,
+ GL_NEAREST, false, y_flip, false, false);
+ }
+
+ intel_miptree_release(&dst_mt);
+ }
+
+ result = true;
+
+ /* As we implement PBO transfers by binding the user-provided BO as a
+ * fake framebuffer and rendering to it. This breaks the invariant of the
+ * GL that nothing is able to render to a BO, causing nondeterministic
+ * corruption issues because the render cache is not coherent with a
+ * number of other caches that the BO could potentially be bound to
+ * afterwards.
+ *
+ * This could be solved in the same way that we guarantee texture
+ * coherency after a texture is attached to a framebuffer and
+ * rendered to, but that would involve checking *all* BOs bound to
+ * the pipeline for the case we need to emit a cache flush due to
+ * previous rendering to any of them -- Including vertex, index,
+ * uniform, atomic counter, shader image, transform feedback,
+ * indirect draw buffers, etc.
+ *
+ * That would increase the per-draw call overhead even though it's
+ * very unlikely that any of the BOs bound to the pipeline has been
+ * rendered to via a PBO at any point, so it seems better to just
+ * flush here unconditionally.
+ */
+ brw_emit_mi_flush(brw);
+
+err:
+ brw_bo_unreference(dst_bo);
+
+ return result;
+}
+
static bool
set_write_disables(const struct intel_renderbuffer *irb,
- const GLubyte *color_mask, bool *color_write_disable)
+ const unsigned color_mask, bool *color_write_disable)
{
/* Format information in the renderbuffer represents the requirements
* given by the client. There are cases where the backing miptree uses,
assert(components > 0);
for (int i = 0; i < components; i++) {
- color_write_disable[i] = !color_mask[i];
- disables = disables || !color_mask[i];
+ color_write_disable[i] = !(color_mask & (1 << i));
+ disables = disables || color_write_disable[i];
}
return disables;
mesa_format format = irb->Base.Base.Format;
if (!encode_srgb && _mesa_get_format_color_encoding(format) == GL_SRGB)
format = _mesa_get_srgb_format_linear(format);
+ enum isl_format isl_format = brw->mesa_to_isl_render_format[format];
x0 = fb->_Xmin;
x1 = fb->_Xmax;
bool can_fast_clear = !partial_clear;
bool color_write_disable[4] = { false, false, false, false };
- if (set_write_disables(irb, ctx->Color.ColorMask[buf], color_write_disable))
+ if (set_write_disables(irb, GET_COLORMASK(ctx->Color.ColorMask, buf),
+ color_write_disable))
can_fast_clear = false;
/* We store clear colors as floats or uints as needed. If there are
/* If the MCS buffer hasn't been allocated yet, we need to allocate it now.
*/
- if (can_fast_clear && !irb->mt->mcs_buf) {
+ if (can_fast_clear && !irb->mt->aux_buf) {
assert(irb->mt->aux_usage == ISL_AUX_USAGE_CCS_D);
- if (!intel_miptree_alloc_ccs(brw, irb->mt)) {
- /* There are a few reasons in addition to out-of-memory, that can
- * cause intel_miptree_alloc_non_msrt_mcs to fail. Try to recover by
- * falling back to non-fast clear.
- */
+ if (!intel_miptree_alloc_aux(brw, irb->mt)) {
+ /* We're out of memory. Fall back to a non-fast clear. */
can_fast_clear = false;
}
}
+ /* FINISHME: Debug and enable fast clears */
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
+ if (devinfo->gen >= 11)
+ can_fast_clear = false;
+
if (can_fast_clear) {
const enum isl_aux_state aux_state =
intel_miptree_get_aux_state(irb->mt, irb->mt_level, irb->mt_layer);
brw_meta_convert_fast_clear_color(brw, irb->mt,
&ctx->Color.ClearColor);
- /* If the buffer is already in INTEL_FAST_CLEAR_STATE_CLEAR, the clear
+ intel_miptree_set_clear_color(brw, irb->mt, clear_color);
+
+ /* If the buffer is already in ISL_AUX_STATE_CLEAR, the clear
* is redundant and can be skipped.
*/
- if (aux_state == ISL_AUX_STATE_CLEAR &&
- memcmp(&irb->mt->fast_clear_color,
- &clear_color, sizeof(clear_color)) == 0)
+ if (aux_state == ISL_AUX_STATE_CLEAR)
return;
- irb->mt->fast_clear_color = clear_color;
-
DBG("%s (fast) to mt %p level %d layers %d+%d\n", __FUNCTION__,
irb->mt, irb->mt_level, irb->mt_layer, num_layers);
/* We can't setup the blorp_surf until we've allocated the MCS above */
struct isl_surf isl_tmp[2];
struct blorp_surf surf;
- blorp_surf_for_miptree(brw, &surf, irb->mt, true, false, 0,
+ blorp_surf_for_miptree(brw, &surf, irb->mt, irb->mt->aux_usage, true,
&level, irb->mt_layer, num_layers, isl_tmp);
/* Ivybrigde PRM Vol 2, Part 1, "11.7 MCS Buffer for Render Target(s)":
brw_emit_end_of_pipe_sync(brw, PIPE_CONTROL_RENDER_TARGET_FLUSH);
struct blorp_batch batch;
- blorp_batch_init(&brw->blorp, &batch, brw, 0);
- blorp_fast_clear(&batch, &surf,
- brw->mesa_to_isl_render_format[format],
+ blorp_batch_init(&brw->blorp, &batch, brw,
+ BLORP_BATCH_NO_UPDATE_CLEAR_COLOR);
+ blorp_fast_clear(&batch, &surf, isl_format,
level, irb->mt_layer, num_layers,
x0, y0, x1, y1);
blorp_batch_finish(&batch);
DBG("%s (slow) to mt %p level %d layer %d+%d\n", __FUNCTION__,
irb->mt, irb->mt_level, irb->mt_layer, num_layers);
+ enum isl_aux_usage aux_usage =
+ intel_miptree_render_aux_usage(brw, irb->mt, isl_format,
+ false, false);
+ intel_miptree_prepare_render(brw, irb->mt, level, irb->mt_layer,
+ num_layers, aux_usage);
+
struct isl_surf isl_tmp[2];
struct blorp_surf surf;
- blorp_surf_for_miptree(brw, &surf, irb->mt, true, true,
- (1 << ISL_AUX_USAGE_MCS) |
- (1 << ISL_AUX_USAGE_CCS_E) |
- (1 << ISL_AUX_USAGE_CCS_D),
+ blorp_surf_for_miptree(brw, &surf, irb->mt, aux_usage, true,
&level, irb->mt_layer, num_layers, isl_tmp);
union isl_color_value clear_color;
struct blorp_batch batch;
blorp_batch_init(&brw->blorp, &batch, brw, 0);
- blorp_clear(&batch, &surf,
- brw->mesa_to_isl_render_format[format],
- ISL_SWIZZLE_IDENTITY,
+ blorp_clear(&batch, &surf, isl_format, ISL_SWIZZLE_IDENTITY,
level, irb->mt_layer, num_layers,
x0, y0, x1, y1,
clear_color, color_write_disable);
blorp_batch_finish(&batch);
+
+ intel_miptree_finish_render(brw, irb->mt, level, irb->mt_layer,
+ num_layers, aux_usage);
}
return;
struct isl_surf isl_tmp[4];
struct blorp_surf depth_surf, stencil_surf;
+ struct intel_mipmap_tree *depth_mt = NULL;
if (mask & BUFFER_BIT_DEPTH) {
struct intel_renderbuffer *irb = intel_renderbuffer(depth_rb);
- struct intel_mipmap_tree *depth_mt =
- find_miptree(GL_DEPTH_BUFFER_BIT, irb);
+ depth_mt = find_miptree(GL_DEPTH_BUFFER_BIT, irb);
level = irb->mt_level;
start_layer = irb->mt_layer;
num_layers = fb->MaxNumLayers ? irb->layer_count : 1;
+ intel_miptree_prepare_depth(brw, depth_mt, level,
+ start_layer, num_layers);
+
unsigned depth_level = level;
- blorp_surf_for_miptree(brw, &depth_surf, depth_mt, true,
- true, (1 << ISL_AUX_USAGE_HIZ),
- &depth_level, start_layer, num_layers,
+ blorp_surf_for_miptree(brw, &depth_surf, depth_mt, depth_mt->aux_usage,
+ true, &depth_level, start_layer, num_layers,
&isl_tmp[0]);
assert(depth_level == level);
}
uint8_t stencil_mask = 0;
+ struct intel_mipmap_tree *stencil_mt = NULL;
if (mask & BUFFER_BIT_STENCIL) {
struct intel_renderbuffer *irb = intel_renderbuffer(stencil_rb);
- struct intel_mipmap_tree *stencil_mt =
- find_miptree(GL_STENCIL_BUFFER_BIT, irb);
+ stencil_mt = find_miptree(GL_STENCIL_BUFFER_BIT, irb);
if (mask & BUFFER_BIT_DEPTH) {
assert(level == irb->mt_level);
assert(start_layer == irb->mt_layer);
assert(num_layers == fb->MaxNumLayers ? irb->layer_count : 1);
- } else {
- level = irb->mt_level;
- start_layer = irb->mt_layer;
- num_layers = fb->MaxNumLayers ? irb->layer_count : 1;
}
+ level = irb->mt_level;
+ start_layer = irb->mt_layer;
+ num_layers = fb->MaxNumLayers ? irb->layer_count : 1;
+
stencil_mask = ctx->Stencil.WriteMask[0] & 0xff;
+ intel_miptree_prepare_access(brw, stencil_mt, level, 1,
+ start_layer, num_layers,
+ ISL_AUX_USAGE_NONE, false);
+
unsigned stencil_level = level;
- blorp_surf_for_miptree(brw, &stencil_surf, stencil_mt, true, true, 0,
+ blorp_surf_for_miptree(brw, &stencil_surf, stencil_mt,
+ ISL_AUX_USAGE_NONE, true,
&stencil_level, start_layer, num_layers,
&isl_tmp[2]);
}
(mask & BUFFER_BIT_DEPTH), ctx->Depth.Clear,
stencil_mask, ctx->Stencil.Clear);
blorp_batch_finish(&batch);
+
+ if (mask & BUFFER_BIT_DEPTH) {
+ intel_miptree_finish_depth(brw, depth_mt, level,
+ start_layer, num_layers, true);
+ }
+
+ if (stencil_mask) {
+ intel_miptree_finish_write(brw, stencil_mt, level,
+ start_layer, num_layers,
+ ISL_AUX_USAGE_NONE);
+ }
}
void
brw_blorp_resolve_color(struct brw_context *brw, struct intel_mipmap_tree *mt,
unsigned level, unsigned layer,
- enum blorp_fast_clear_op resolve_op)
+ enum isl_aux_op resolve_op)
{
DBG("%s to mt %p level %u layer %u\n", __FUNCTION__, mt, level, layer);
struct isl_surf isl_tmp[1];
struct blorp_surf surf;
- blorp_surf_for_miptree(brw, &surf, mt, true, false, 0,
+ blorp_surf_for_miptree(brw, &surf, mt, mt->aux_usage, true,
&level, layer, 1 /* num_layers */,
isl_tmp);
struct blorp_batch batch;
blorp_batch_init(&brw->blorp, &batch, brw, 0);
- blorp_ccs_resolve(&batch, &surf, level, layer,
+ blorp_ccs_resolve(&batch, &surf, level, layer, 1,
brw_blorp_to_isl_format(brw, format, true),
resolve_op);
blorp_batch_finish(&batch);
brw_emit_end_of_pipe_sync(brw, PIPE_CONTROL_RENDER_TARGET_FLUSH);
}
+void
+brw_blorp_mcs_partial_resolve(struct brw_context *brw,
+ struct intel_mipmap_tree *mt,
+ uint32_t start_layer, uint32_t num_layers)
+{
+ DBG("%s to mt %p layers %u-%u\n", __FUNCTION__, mt,
+ start_layer, start_layer + num_layers - 1);
+
+ assert(mt->aux_usage == ISL_AUX_USAGE_MCS);
+
+ const mesa_format format = _mesa_get_srgb_format_linear(mt->format);
+ enum isl_format isl_format = brw_blorp_to_isl_format(brw, format, true);
+
+ struct isl_surf isl_tmp[1];
+ struct blorp_surf surf;
+ uint32_t level = 0;
+ blorp_surf_for_miptree(brw, &surf, mt, ISL_AUX_USAGE_MCS, true,
+ &level, start_layer, num_layers, isl_tmp);
+
+ struct blorp_batch batch;
+ blorp_batch_init(&brw->blorp, &batch, brw, 0);
+ blorp_mcs_partial_resolve(&batch, &surf, isl_format,
+ start_layer, num_layers);
+ blorp_batch_finish(&batch);
+}
+
/**
* Perform a HiZ or depth resolve operation.
*
void
intel_hiz_exec(struct brw_context *brw, struct intel_mipmap_tree *mt,
unsigned int level, unsigned int start_layer,
- unsigned int num_layers, enum blorp_hiz_op op)
+ unsigned int num_layers, enum isl_aux_op op)
{
assert(intel_miptree_level_has_hiz(mt, level));
- assert(op != BLORP_HIZ_OP_NONE);
+ assert(op != ISL_AUX_OP_NONE);
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
const char *opname = NULL;
switch (op) {
- case BLORP_HIZ_OP_DEPTH_RESOLVE:
+ case ISL_AUX_OP_FULL_RESOLVE:
opname = "depth resolve";
break;
- case BLORP_HIZ_OP_HIZ_RESOLVE:
+ case ISL_AUX_OP_AMBIGUATE:
opname = "hiz ambiguate";
break;
- case BLORP_HIZ_OP_DEPTH_CLEAR:
+ case ISL_AUX_OP_FAST_CLEAR:
opname = "depth clear";
break;
- case BLORP_HIZ_OP_NONE:
- opname = "noop?";
- break;
+ case ISL_AUX_OP_PARTIAL_RESOLVE:
+ case ISL_AUX_OP_NONE:
+ unreachable("Invalid HiZ op");
}
DBG("%s %s to mt %p level %d layers %d-%d\n",
* HiZ clear operations. However, they also seem to be required for
* resolve operations.
*/
- if (brw->gen == 6) {
+ if (devinfo->gen == 6) {
/* From the Sandy Bridge PRM, volume 2 part 1, page 313:
*
* "If other rendering operations have preceded this clear, a
PIPE_CONTROL_RENDER_TARGET_FLUSH |
PIPE_CONTROL_DEPTH_CACHE_FLUSH |
PIPE_CONTROL_CS_STALL);
- } else if (brw->gen >= 7) {
+ } else if (devinfo->gen >= 7) {
/*
* From the Ivybridge PRM, volume 2, "Depth Buffer Clear":
*
brw_emit_pipe_control_flush(brw, PIPE_CONTROL_DEPTH_STALL);
}
+ assert(mt->aux_usage == ISL_AUX_USAGE_HIZ && mt->aux_buf);
struct isl_surf isl_tmp[2];
struct blorp_surf surf;
- blorp_surf_for_miptree(brw, &surf, mt, true, false, 0,
+ blorp_surf_for_miptree(brw, &surf, mt, ISL_AUX_USAGE_HIZ, true,
&level, start_layer, num_layers, isl_tmp);
- assert(surf.aux_usage == ISL_AUX_USAGE_HIZ);
-
struct blorp_batch batch;
- blorp_batch_init(&brw->blorp, &batch, brw, 0);
+ blorp_batch_init(&brw->blorp, &batch, brw,
+ BLORP_BATCH_NO_UPDATE_CLEAR_COLOR);
blorp_hiz_op(&batch, &surf, level, start_layer, num_layers, op);
blorp_batch_finish(&batch);
* HiZ clear operations. However, they also seem to be required for
* resolve operations.
*/
- if (brw->gen == 6) {
+ if (devinfo->gen == 6) {
/* From the Sandy Bridge PRM, volume 2 part 1, page 314:
*
* "DevSNB, DevSNB-B{W/A}]: Depth buffer clear pass must be
brw_emit_pipe_control_flush(brw,
PIPE_CONTROL_DEPTH_CACHE_FLUSH |
PIPE_CONTROL_CS_STALL);
- } else if (brw->gen >= 8) {
+ } else if (devinfo->gen >= 8) {
/*
* From the Broadwell PRM, volume 7, "Depth Buffer Clear":
*
projects / mesa.git / blobdiff