i965: Enable EGL_KHR_gl_texture_3D_image

[mesa.git] / src / mesa / drivers / dri / i965 / intel_fbo.h

diff --git a/src/mesa/drivers/dri/i965/intel_fbo.h b/src/mesa/drivers/dri/i965/intel_fbo.h
index 67f64d365eee8e9c47581e02b48fb73f142c34f7..89894cd3e86291af6d0a97af085c74bcc73c5985 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_fbo.h
+++ b/src/mesa/drivers/dri/i965/intel_fbo.h
@@ -1,5 +1,4 @@
-/**************************************************************************
- *
+/*
  * Copyright 2006 VMware, Inc.
  * All Rights Reserved.
  *
@@ -7,7 +6,7 @@
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
+ * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
  *
@@ -17,13 +16,12 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
  * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
+ */
 
 #ifndef INTEL_FBO_H
 #define INTEL_FBO_H
@@ -41,7 +39,6 @@ extern "C" {
 #endif
 
 struct intel_mipmap_tree;
-struct intel_texture_image;
 
 /**
  * Intel renderbuffer, derived from gl_renderbuffer.
@@ -49,7 +46,26 @@ struct intel_texture_image;
 struct intel_renderbuffer
 {
    struct swrast_renderbuffer Base;
-   struct intel_mipmap_tree *mt; /**< The renderbuffer storage. */
+   /**
+    * The real renderbuffer storage.
+    *
+    * This is multisampled if NumSamples is > 1.
+    */
+   struct intel_mipmap_tree *mt;
+
+   /**
+    * Downsampled contents for window-system MSAA renderbuffers.
+    *
+    * For window system MSAA color buffers, the singlesample_mt is shared with
+    * other processes in DRI2 (and in DRI3, it's the image buffer managed by
+    * glx_dri3.c), while mt is private to our process.  To do a swapbuffers,
+    * we have to downsample out of mt into singlesample_mt.  For depth and
+    * stencil buffers, the singlesample_mt is also private, and since we don't
+    * expect to need to do resolves (except if someone does a glReadPixels()
+    * or glCopyTexImage()), we just temporarily allocate singlesample_mt when
+    * asked to map the renderbuffer.
+    */
+   struct intel_mipmap_tree *singlesample_mt;
 
    /**
     * \name Miptree view
@@ -71,9 +87,30 @@ struct intel_renderbuffer
     */
    unsigned int mt_level;
    unsigned int mt_layer;
+
+   /* The number of attached logical layers. */
+   unsigned int layer_count;
    /** \} */
 
    GLuint draw_x, draw_y; /**< Offset of drawing within the region */
+
+   /**
+    * Set to true at every draw call, to indicate if a window-system
+    * renderbuffer needs to be downsampled before using singlesample_mt.
+    */
+   bool need_downsample;
+
+   /**
+    * Set to true when doing an intel_renderbuffer_map()/unmap() that requires
+    * an upsample at the end.
+    */
+   bool need_map_upsample;
+
+   /**
+    * Set to true if singlesample_mt is temporary storage that persists only
+    * for the duration of a mapping.
+    */
+   bool singlesample_mt_is_tmp;
 };
 
 
@@ -125,22 +162,22 @@ intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex)
 }
 
 
-static inline gl_format
+static inline mesa_format
 intel_rb_format(const struct intel_renderbuffer *rb)
 {
    return rb->Base.Base.Format;
 }
 
 extern struct intel_renderbuffer *
-intel_create_renderbuffer(gl_format format, unsigned num_samples);
+intel_create_renderbuffer(mesa_format format, unsigned num_samples);
 
 struct intel_renderbuffer *
-intel_create_private_renderbuffer(gl_format format, unsigned num_samples);
+intel_create_private_renderbuffer(mesa_format format, unsigned num_samples);
 
 struct gl_renderbuffer*
 intel_create_wrapped_renderbuffer(struct gl_context * ctx,
                                  int width, int height,
-                                 gl_format format);
+                                 mesa_format format);
 
 extern void
 intel_fbo_init(struct brw_context *brw);
@@ -157,9 +194,6 @@ intel_renderbuffer_get_tile_offsets(struct intel_renderbuffer *irb,
                                          tile_x, tile_y);
 }
 
-void
-intel_renderbuffer_set_needs_downsample(struct intel_renderbuffer *irb);
-
 bool
 intel_renderbuffer_has_hiz(struct intel_renderbuffer *irb);
 
@@ -195,6 +229,18 @@ void intel_renderbuffer_move_to_temp(struct brw_context *brw,
                                      struct intel_renderbuffer *irb,
                                      bool invalidate);
 
+void
+intel_renderbuffer_downsample(struct brw_context *brw,
+                              struct intel_renderbuffer *irb);
+
+void
+intel_renderbuffer_upsample(struct brw_context *brw,
+                            struct intel_renderbuffer *irb);
+
+void brw_render_cache_set_clear(struct brw_context *brw);
+void brw_render_cache_set_add_bo(struct brw_context *brw, drm_intel_bo *bo);
+void brw_render_cache_set_check_flush(struct brw_context *brw, drm_intel_bo *bo);
+
 unsigned
 intel_quantize_num_samples(struct intel_screen *intel, unsigned num_samples);