X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fintel_fbo.h;h=89894cd3e86291af6d0a97af085c74bcc73c5985;hb=8bed1adfc144d9ae8d55ccb9b277942da8a78064;hp=2a8a462b18e2cca6e06295ce16f0d358e225f68e;hpb=8c9a54e7bcfc80295ad77097910d35958dfd3644;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/intel_fbo.h b/src/mesa/drivers/dri/i965/intel_fbo.h index 2a8a462b18e..89894cd3e86 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.h +++ b/src/mesa/drivers/dri/i965/intel_fbo.h @@ -1,29 +1,27 @@ -/************************************************************************** - * - * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas. +/* + * Copyright 2006 VMware, Inc. * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * 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: - * + * * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. - * + * * 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. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * 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 @@ -63,12 +79,38 @@ struct intel_renderbuffer * * For renderbuffers not created with glFramebufferTexture*(), mt_level and * mt_layer are 0. + * + * Note: for a 2D multisample array texture on Gen7+ using + * INTEL_MSAA_LAYOUT_UMS or INTEL_MSAA_LAYOUT_CMS, mt_layer is the physical + * layer holding sample 0. So, for example, if mt->num_samples == 4, then + * logical layer n corresponds to mt_layer == 4*n. */ 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; }; @@ -84,7 +126,7 @@ struct intel_renderbuffer * NULL will be returned if the rb isn't really an intel_renderbuffer. * This is determined by checking the ClassID. */ -static INLINE struct intel_renderbuffer * +static inline struct intel_renderbuffer * intel_renderbuffer(struct gl_renderbuffer *rb) { struct intel_renderbuffer *irb = (struct intel_renderbuffer *) rb; @@ -105,7 +147,7 @@ intel_renderbuffer(struct gl_renderbuffer *rb) * If the attached renderbuffer is a wrapper, then return wrapped * renderbuffer. */ -static INLINE struct intel_renderbuffer * +static inline struct intel_renderbuffer * intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex) { struct gl_renderbuffer *rb; @@ -120,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); @@ -152,17 +194,11 @@ 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); void -intel_renderbuffer_set_needs_hiz_resolve(struct intel_renderbuffer *irb); - -void -intel_renderbuffer_set_needs_depth_resolve(struct intel_renderbuffer *irb); +intel_renderbuffer_att_set_needs_depth_resolve(struct gl_renderbuffer_attachment *att); /** @@ -193,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);