i965/nir: Sort uniforms direct-first and use two different uniform registers

[mesa.git] / src / mesa / drivers / dri / i965 / intel_tex.c

diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/intel_tex.c
index f18ca45647172c697425c82cdfd9b1f31a0498f1..2d3009a30d12d89e8f7a32b03a533c71e07742ca 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex.c
+++ b/src/mesa/drivers/dri/i965/intel_tex.c
@@ -5,6 +5,7 @@
 #include "main/mipmap.h"
 #include "drivers/common/meta.h"
 #include "brw_context.h"
+#include "intel_buffer_objects.h"
 #include "intel_mipmap_tree.h"
 #include "intel_tex.h"
 #include "intel_fbo.h"
@@ -114,7 +115,7 @@ intel_alloc_texture_image_buffer(struct gl_context *ctx,
 /**
  * ctx->Driver.AllocTextureStorage() handler.
  *
- * Compare this to _mesa_alloc_texture_storage, which would call into
+ * Compare this to _mesa_AllocTextureStorage_sw, which would call into
  * intel_alloc_texture_image_buffer() above.
  */
 static GLboolean
@@ -145,8 +146,12 @@ intel_alloc_texture_storage(struct gl_context *ctx,
                                               width, height, depth,
                                               false, /* expect_accelerated */
                                               num_samples,
-                                              INTEL_MIPTREE_TILING_ANY);
+                                              INTEL_MIPTREE_TILING_ANY,
+                                              false);
 
+      if (intel_texobj->mt == NULL) {
+         return false;
+      }
    }
 
    for (face = 0; face < numFaces; face++) {
@@ -201,11 +206,12 @@ intel_map_texture_image(struct gl_context *ctx,
                        GLuint x, GLuint y, GLuint w, GLuint h,
                        GLbitfield mode,
                        GLubyte **map,
-                       GLint *stride)
+                       GLint *out_stride)
 {
    struct brw_context *brw = brw_context(ctx);
    struct intel_texture_image *intel_image = intel_texture_image(tex_image);
    struct intel_mipmap_tree *mt = intel_image->mt;
+   ptrdiff_t stride;
 
    /* Our texture data is always stored in a miptree. */
    assert(mt);
@@ -224,7 +230,9 @@ intel_map_texture_image(struct gl_context *ctx,
                      tex_image->Level + tex_image->TexObject->MinLevel,
                      slice + tex_image->TexObject->MinLayer,
                      x, y, w, h, mode,
-                     (void **)map, stride);
+                     (void **)map, &stride);
+
+   *out_stride = stride;
 }
 
 static void
@@ -291,6 +299,65 @@ intel_texture_view(struct gl_context *ctx,
    return GL_TRUE;
 }
 
+static bool
+intel_set_texture_storage_for_buffer_object(struct gl_context *ctx,
+                                            struct gl_texture_object *tex_obj,
+                                            struct gl_buffer_object *buffer_obj,
+                                            uint32_t buffer_offset,
+                                            uint32_t row_stride,
+                                            bool read_only)
+{
+   struct brw_context *brw = brw_context(ctx);
+   struct intel_texture_object *intel_texobj = intel_texture_object(tex_obj);
+   struct gl_texture_image *image = tex_obj->Image[0][0];
+   struct intel_texture_image *intel_image = intel_texture_image(image);
+   struct intel_buffer_object *intel_buffer_obj = intel_buffer_object(buffer_obj);
+
+   if (!read_only) {
+      /* Renderbuffers have the restriction that the buffer offset and
+       * surface pitch must be a multiple of the element size.  If it's
+       * not, we have to fail and fall back to software.
+       */
+      int cpp = _mesa_get_format_bytes(image->TexFormat);
+      if (buffer_offset % cpp || row_stride % cpp) {
+         perf_debug("Bad PBO alignment; fallback to CPU mapping\n");
+         return false;
+      }
+
+      if (!brw->format_supported_as_render_target[image->TexFormat]) {
+         perf_debug("Non-renderable PBO format; fallback to CPU mapping\n");
+         return false;
+      }
+   }
+
+   assert(intel_texobj->mt == NULL);
+
+   drm_intel_bo *bo = intel_bufferobj_buffer(brw, intel_buffer_obj,
+                                             buffer_offset,
+                                             row_stride * image->Height);
+   intel_texobj->mt =
+      intel_miptree_create_for_bo(brw, bo,
+                                  image->TexFormat,
+                                  buffer_offset,
+                                  image->Width, image->Height, image->Depth,
+                                  row_stride);
+   if (!intel_texobj->mt)
+      return false;
+
+   if (!_swrast_init_texture_image(image))
+      return false;
+
+   intel_miptree_reference(&intel_image->mt, intel_texobj->mt);
+
+   /* The miptree is in a validated state, so no need to check later. */
+   intel_texobj->needs_validate = false;
+   intel_texobj->validated_first_level = 0;
+   intel_texobj->validated_last_level = 0;
+   intel_texobj->_Format = intel_texobj->mt->format;
+
+   return true;
+}
+
 void
 intelInitTextureFuncs(struct dd_function_table *functions)
 {
@@ -304,4 +371,6 @@ intelInitTextureFuncs(struct dd_function_table *functions)
    functions->MapTextureImage = intel_map_texture_image;
    functions->UnmapTextureImage = intel_unmap_texture_image;
    functions->TextureView = intel_texture_view;
+   functions->SetTextureStorageForBufferObject =
+      intel_set_texture_storage_for_buffer_object;
 }