URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f028bfcc048d7cbd7a7239e9f61b4d7b708aebb Author: Antia Puentes <apuen...@igalia.com> Date: Wed Oct 21 15:25:30 2015 +0200
i965: Enable the ARB_internalformat_query2 extension Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbbdf8612d784faa0928208fd6599c6add2d0e48 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Dec 22 17:16:50 2015 +0100 i965/formatquery: Add support for INTERNALFORMAT_PREFERRED query This pname is tricky. The spec states that an internal format should be returned, that is compatible with the passed internal format, and has at least the same precision. There is no clear API to resolve this. The closest we have (and what other drivers (i.e, NVidia proprietary) do, is to return the same internal format given as parameter. But we validate first that the passed internal format is supported by i965. To check for support, we have the TextureFormatSupported map'. But this map expects a 'mesa_format', which takes a format+typen. So, we must first "come up" with a generic type that is suited for this internal format, then get a mesa_format, and then do the validation. The cleanest solution here is to add a method that does exactly what the spec wants: a driver's preferred internal format from a given internal format. But at this point we lack a clear view of what defines this preference, and also there seems to be no API for it. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e064f43485b63053f5786f680407f15bc203763f Author: Eduardo Lima Mitev <el...@igalia.com> Date: Wed Feb 3 10:57:10 2016 +0100 mesa/glformats: Consider DEPTH/STENCIL when resolving a mesa_format _mesa_format_from_format_and_type() is currently not considering DEPTH and STENCIL formats, which are not array formats and are not handled anywhere. This patch adds cases for common combinations of DEPTH/STENCIL format and types. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec299602a6a1db209e8e93c0853ccad1eb4ffa72 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Dec 22 19:33:57 2015 +0100 mesa/formatquery: Add (GET_)TEXTURE_IMAGE_TYPE pnames These basically reuse the default implementation of GL_READ_PIXELS_TYPE. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=23f94146c987c380bcdebb0d787dc71e808afc27 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Dec 22 19:19:32 2015 +0100 mesa/formatquery: Add (GET_)TEXTURE_IMAGE_FORMAT pnames Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=020671f2a3d47ff35e9937b4db3fa09df6f6d488 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Dec 22 18:52:38 2015 +0100 mesa/formatquery: Add READ_PIXELS_TYPE pname We call the driver to provide its preferred type, but also provide a default implementation that selects a generic type based on the passed internal format. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bec286f7246bedba9f7f34185f2e1e29befec3ab Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Dec 22 18:38:06 2015 +0100 mesa/formatquery: Add READ_PIXELS_FORMAT pname Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=09550c16a51e89dbf64b0864d3fb4ddb6accac52 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Dec 22 18:20:57 2015 +0100 mesa/formatquery: Add support for READ_PIXELS query This is supported since very early version of OpenGL, but we still call the driver to give it the opportunity to report caveat or no support. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d7696f6380c38085029fff0eb00c3c18ea8e017 Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Tue Dec 22 20:06:19 2015 +0100 mesa/formatquery: added FILTER pname support It discards out the targets and internalformats that explicitly mention (per-spec) that doesn't support filter types other than NEAREST or NEAREST_MIPMAP_NEAREST. Those are: * Texture buffers target * Multisample targets * Any integer internalformat For the case of multisample targets, it was used the existing method _mesa_target_allows_setting_sampler_parameter. This would scalate better in the future if new targets appear that doesn't allow to set sampler parameters. We consider RENDERBUFFER to support LINEAR filters, because although it doesn't support this filter for sampling, you can set LINEAR on a blit operation using glBlitFramebuffer. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8736a2567057c0cb3cdd673743d9cc8b562b288 Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Tue Dec 22 20:04:38 2015 +0100 mesa/texparam: make public target_allows_setting_sampler_parameters In order to allow to be used on ARB_internalformat_query2 implementation. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8ab7727e1cb359be565b9d3dace1c0490e452ad Author: Antia Puentes <apuen...@igalia.com> Date: Mon Dec 21 18:55:56 2015 +0100 mesa/formatquery: Added framebuffer renderability related queries From the ARB_internalformat_query2 specification: "- FRAMEBUFFER_RENDERABLE: The support for rendering to the resource via framebuffer attachment is returned in <params>. - FRAMEBUFFER_RENDERABLE_LAYERED: The support for layered rendering to the resource via framebuffer attachment is returned in <params>. - FRAMEBUFFER_BLEND: The support for rendering to the resource via framebuffer attachment when blending is enabled is returned in <params>." For all of them, "Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource is unsupported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4ee9f56fd8e457c91a85bcebb124b088edee76e Author: Antia Puentes <apuen...@igalia.com> Date: Mon Dec 21 15:57:25 2015 +0100 mesa/formatquery: Added texture gather/shadow related queries From the ARB_internalformat_query2 specification: "- TEXTURE_SHADOW: The support for using the resource with shadow samplers is written to <params>. - TEXTURE_GATHER: The support for using the resource with texture gather operations is written to <params>. - TEXTURE_GATHER_SHADOW: The support for using resource with texture gather operations with shadow samplers is written to <params>." For all of them, "Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=557939c08faed7766aeee187c168ed4083c67e35 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 20:29:31 2015 +0100 mesa/formatquery: Added texture view related queries From the ARB_internalformat_query2 specification: "- TEXTURE_VIEW: The support for using the resource with the TextureView command is returned in <params>. Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned. - VIEW_COMPATIBILITY_CLASS: The compatibility class of the resource when used as a texture view is returned in <params>. The compatibility class is one of the values from the /Class/ column of Table 3.X.2. If the resource has no other formats that are compatible, the resource does not support views, or if texture views are not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=04e2e0b24a72dc4f66a0d56cee8b5d50233374a7 Author: Antia Puentes <apuen...@igalia.com> Date: Mon Nov 16 15:45:54 2015 +0100 mesa/textureview: Make _lookup_view_class public It will be used by the ARB_internalformat_query2 implementation to implement the VIEW_COMPATIBILITY_CLASS <pname> query. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2066c7be61c2edc07c79ea690ee1aef92665b5ec Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 20:27:16 2015 +0100 mesa/formatquery: Added CLEAR_BUFFER <pname> query From the ARB_internalformat_query2 specification: "- CLEAR_BUFFER: The support for using the resource with ClearBuffer*Data commands is returned in <params>. Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aed633bb97443749f250951553287cde021a1aaa Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 20:23:29 2015 +0100 mesa/formatquery: Added compressed texture related queries From the ARB_internalformat_query2 specification: "- TEXTURE_COMPRESSED: If <internalformat> is a compressed format that is supported for this type of resource, TRUE is returned in <params>. If the internal format is not compressed, or the type of resource is not supported, FALSE is returned. - TEXTURE_COMPRESSED_BLOCK_WIDTH: If the resource contains a compressed format, the width of a compressed block (in bytes) is returned in <params>. If the internal format is not compressed, or the resource is not supported, 0 is returned. - TEXTURE_COMPRESSED_BLOCK_HEIGHT: If the resource contains a compressed format, the height of a compressed block (in bytes) is returned in <params>. If the internal format is not compressed, or the resource is not supported, 0 is returned. - TEXTURE_COMPRESSED_BLOCK_SIZE: If the resource contains a compressed format the number of bytes per block is returned in <params>. If the internal format is not compressed, or the resource is not supported, 0 is returned. (combined with the above, allows the bitrate to be computed, and may be useful in conjunction with ARB_compressed_texture_pixel_storage)." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=467f462c75281083f91846f176d6fd4a5d1afbbd Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 20:17:11 2015 +0100 mesa/formatquery: Added simultaneous texture and depth/stencil queries From the ARB_internalformat_query2 specification: "- SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST: The support for using the resource both as a source for texture sampling while it is bound as a buffer for depth test is written to <params>. For example, a depth (or stencil) texture could be bound simultaneously for texturing while it is bound as a depth (and/or stencil) buffer without causing a feedback loop, provided that depth writes are disabled. - SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST: The support for using the resource both as a source for texture sampling while it is bound as a buffer for stencil test is written to <params>. For example, a depth (or stencil) texture could be bound simultaneously for texturing while it is bound as a depth (and/or stencil) buffer without causing a feedback loop, provided that stencil writes are disabled. - SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE: The support for using the resource both as a source for texture sampling while performing depth writes to the resources is written to <params>. For example, a depth-stencil texture could be bound simultaneously for stencil texturing while it is bound as a depth buffer. Feedback loops cannot occur because sampling a stencil texture only returns the stencil portion, and thus writes to the depth buffer do not modify the stencil portions. - SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE: The support for using the resource both as a source for texture sampling while performing stencil writes to the resources is written to <params>. For example, a depth-stencil texture could be bound simultaneously for depth-texturing while it is bound as a stencil buffer. Feedback loops cannot occur because sampling a depth texture only returns the depth portion, and thus writes to the stencil buffer could not modify the depth portions. For all of them, "Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd45fb3de4d067c014084affef76095ba74091d9 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 19:50:25 2015 +0100 mesa/formatquery: Added queries related to image textures From the ARB_internalformat_query2 specification: "- IMAGE_TEXEL_SIZE: The size of a texel when the resource when used as an image texture is returned in <params>. This is the value from the /Size/ column in Table 3.22. If the resource is not supported for image textures, or if image textures are not supported, zero is returned. - IMAGE_COMPATIBILITY_CLASS: The compatibility class of the resource when used as an image texture is returned in <params>. This corresponds to the value from the /Class/ column in Table 3.22. The possible values returned are IMAGE_CLASS_4_X_32, IMAGE_CLASS_2_X_32, IMAGE_CLASS_1_X_32, IMAGE_CLASS_4_X_16, IMAGE_CLASS_2_X_16, IMAGE_CLASS_1_X_16, IMAGE_CLASS_4_X_8, IMAGE_CLASS_2_X_8, IMAGE_CLASS_1_X_8, IMAGE_CLASS_11_11_10, and IMAGE_CLASS_10_10_10_2, which correspond to the 4x32, 2x32, 1x32, 4x16, 2x16, 1x16, 4x8, 2x8, 1x8, the class (a) 11/11/10 packed floating-point format, and the class (b) 10/10/10/2 packed formats, respectively. If the resource is not supported for image textures, or if image textures are not supported, NONE is returned. - IMAGE_PIXEL_FORMAT: The pixel format of the resource when used as an image texture is returned in <params>. This is the value from the /Pixel format/ column in Table 3.22. If the resource is not supported for image textures, or if image textures are not supported, NONE is returned. - IMAGE_PIXEL_TYPE: The pixel type of the resource when used as an image texture is returned in <params>. This is the value from the /Pixel type/ column in Table 3.22. If the resource is not supported for image textures, or if image textures are not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=990a7200e091f1d0f79979f9c02fc50a07d6acad Author: Antia Puentes <apuen...@igalia.com> Date: Tue Nov 17 21:29:04 2015 +0100 mesa/shaderimage: Added func to get the GL_IMAGE_CLASS from the format It will be used by the ARB_internalformat_query2 implementation to implement the IMAGE_COMPATIBILITY_CLASS <pname> query. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=52c3692324675535105f2d5bbdf2c4cd26e76580 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 19:39:53 2015 +0100 mesa/formatquery: Added SHADER_IMAGE_{LOAD,STORE,ATOMIC} <pname> queries From the ARB_internalformat_query2 specification: "- SHADER_IMAGE_LOAD: The support for using the resource with image load operations in shaders is written to <params>. In this case the <internalformat> is the value of the <format> parameter that would be passed to BindImageTexture. - SHADER_IMAGE_STORE: The support for using the resource with image store operations in shaders is written to <params>. In this case the <internalformat> is the value of the <format> parameter that is passed to BindImageTexture. - SHADER_IMAGE_ATOMIC: The support for using the resource with atomic memory operations from shaders is written to <params>." For all of them: "Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=876f7a7c081dd8261a3d969ec1d76ddac64afcbb Author: Antia Puentes <apuen...@igalia.com> Date: Sun Nov 15 18:01:56 2015 +0100 mesa/shaderimage: Make is_image_format_supported public It will be used by the ARB_internalformat_query2 implementation to implement queries related to the ARB_shader_image_load_store extension. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fae2b10ff9ec568df328785183e483d4fcbf0f83 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 19:24:28 2015 +0100 mesa/formatquery: Added queries related to texture sampling in shaders From the ARB_internalformat_query2 specification: "- VERTEX_TEXTURE: The support for using the resource as a source for texture sampling in a vertex shader is written to <params>. - TESS_CONTROL_TEXTURE: The support for using the resource as a source for texture sampling in a tessellation control shader is written to <params>. - TESS_EVALUATION_TEXTURE: The support for using the resource as a source for texture sampling in a tessellation evaluation shader is written to <params>. - GEOMETRY_TEXTURE: The support for using the resource as a source for texture sampling in a geometry shader is written to <params>. - FRAGMENT_TEXTURE: The support for using the resource as a source for texture sampling in a fragment shader is written to <params>. - COMPUTE_TEXTURE: The support for using the resource as a source for texture sampling in a compute shader is written to <params>." For all of them, "Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aeb759c7d631eb10a69245ba8d7b6a2179a268f5 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 19:17:39 2015 +0100 mesa/formatquery: Added SRGB_DECODE_ARB <pname> query From the ARB_internalformat_query2 specification: "- SRGB_DECODE_ARB: The support for toggling whether sRGB decode happens at sampling time (see EXT/ARB_texture_sRGB_decode) for the resource is returned in <params>. Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bcb2f9cdb97ab2b866e238780ba68908b10e2e79 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 19:14:51 2015 +0100 mesa/formatquery: Added SRGB_{READ,WRITE} <pname> queries From the ARB_internalformat_query2 specification: "- SRGB_READ: The support for converting from sRGB colorspace on read operations (see section 3.9.18) from the resource is returned in <params>. Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned. - SRGB_WRITE: The support for converting to sRGB colorspace on write operations to the resource is returned in <params>. This indicates that writing to framebuffers with this internalformat will encode to sRGB color spaces when FRAMEBUFFER_SRGB is enabled (see section 4.1.8). Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource or operation is not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e88cbb7a51051da66bf142515bc028559f999a64 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 19:10:51 2015 +0100 mesa/formatquery: Added COLOR_ENCODING <pname> query. From the ARB_internalformat_query2 specification: "- COLOR_ENCODING: The color encoding for the resource is returned in <params>. Possible values for color buffers are LINEAR or SRGB, for linear or sRGB-encoded color components, respectively. For non-color formats (such as depth or stencil), or for unsupported resources, the value NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1755535ecfb5bacf21c3118c359196ad81b5e68 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Wed Feb 3 13:40:27 2016 +0100 mesa/glformats: Add a helper function _mesa_is_srgb_format() Returns true if the passed format is an sRGB format, false otherwise. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87b2de3998fd26767af437ffe512779dc2e8d404 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 18:49:08 2015 +0100 mesa/formatquery: Added mipmap related <pname> queries Specifically MIPMAP, MANUAL_GENERATE_MIPMAP and AUTO_GENERATE_MIPMAP <pname> queries. From the ARB_internalformat_query2 specification: "- MIPMAP: If the resource supports mipmaps, TRUE is returned in <params>. If the resource is not supported, or if mipmaps are not supported for this type of resource, FALSE is returned. - MANUAL_GENERATE_MIPMAP: The support for manually generating mipmaps for the resource is returned in <params>. Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource is not supported, or if the operation is not supported, NONE is returned. - AUTO_GENERATE_MIPMAP: The support for automatic generation of mipmaps for the resource is returned in <params>. Possible values returned are FULL_SUPPORT, CAVEAT_SUPPORT, or NONE. If the resource is not supported, or if the operation is not supported, NONE is returned." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=079d99b830073f55a22954f6bb2b56cfb731e5e3 Author: Antia Puentes <apuen...@igalia.com> Date: Thu Nov 26 15:20:24 2015 +0100 mesa/genmipmap: Added a function to validate the internalformat It will be used by the ARB_internalformat_query2 implementation to implement mipmap related queries. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=06852f4b7a1ab9ea724bd7708662b2e6549aa98e Author: Antia Puentes <apuen...@igalia.com> Date: Thu Nov 26 15:08:47 2015 +0100 mesa/genmipmap: Added a function to check if the target is valid It will be used by the ARB_internalformat_query2 implementation to implement mipmap related queries. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df3a37311d2cb1bf83e6803a8c974b7269d4c3c9 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 18:35:57 2015 +0100 mesa/formatquery: Added {COLOR,DEPTH,STENCIL}_RENDERABLE <pname> queries Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c22ceb08bb4340b8f6e13e5b94fb288ce1bfeefa Author: Antia Puentes <apuen...@igalia.com> Date: Tue Nov 10 13:53:45 2015 +0100 mesa/formatquery: Added {COLOR,DEPTH,STENCIL}_COMPONENTS <pname> queries Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e976a30db8f24ec81259140f157a224c49aa373e Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Sat Dec 19 12:15:00 2015 +0100 mesa/formatquery: support for MAX_COMBINED_DIMENSIONS It is implemented combining the values returned by calls to the 32-bit query _mesa_GetInternalformati32v. The main reason is simplicity. The other option would be C&P how we implemented the support of GL_MAX_{WIDTH/HEIGHT/DEPTH} and GL_SAMPLES. Additionally, doing this way, we avoid adding checks on the code, as are done by the call to the query itself. MAX_COMBINED_DIMENSIONS is the only pname pointed on the spec of needing a 64-bit query. We handle that possibility by packing the returning value on the two first 32-bit integers of params. This would work on the 32-bit query as far as the value is not greater that INT_MAX. On the 64-bit query wrapper we unpack those values in order to get the final value. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5cf16a4fcf64eb1f6b5923e0d46b3f7dfee23a9 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Jan 12 19:36:20 2016 +0100 mesa/teximage: add _mesa_is_cube_map_texture utility method Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e33278b39f5292b5ca82281f7b364d402ba48b2 Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Sat Dec 19 11:54:32 2015 +0100 main/formatquery: support for MAX_{WIDTH/HEIGHT/DEPTH/LAYERS} Implemented by calling GetIntegerv with the equivalent pname and handling individually the exceptions related to dimensions. All those pnames are used to get the maximum value for each dimension of the given target. The only difference between this calls and calling GetInteger with pnames like GL_MAX_TEXTURE_SIZE, GL_MAX_3D_TEXTURE_SIZE, etc is that GetInternalformat allows to specify a internalformat. But at this moment, there is no reason to think that the values would be different based on the internalformat. The spec already take that into account, using these specific pnames as example on Issue 7 of arb_internalformat_query2 spec. So this seems like a hook to allow to return different values based on the internalformat in the future. It is worth to note that the piglit test associated to those pnames are checking the returned values of GetInternalformat against the values returned by GetInteger, and the test is passing with NVIDIA proprietary drivers. main/formatquery: support for MAX_{WIDTH/HEIGHT/DEPTH/LAYERS} Implemented by calling GetIntegerv with the equivalent pname and handling individually the exceptions related to dimensions. All those pnames are used to get the maximum value for each dimension of the given target. The only difference between this calls and calling GetInteger with pnames like GL_MAX_TEXTURE_SIZE, GL_MAX_3D_TEXTURE_SIZE, etc is that GetInternalformat allows to specify a internalformat. But at this moment, there is no reason to think that the values would be different based on the internalformat. The spec already take that into account, using these specific pnames as example on Issue 7 of arb_internalformat_query2 spec. So this seems like a hook to allow to return different values based on the internalformat in the future. It is worth to note that the piglit test associated to those pnames are checking the returned values of GetInternalformat against the values returned by GetInteger, and the test is passing with NVIDIA proprietary drivers. v2: use _mesa_has## instead of direct ctx->Extensions access (Nanley Chery) Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b750144b0a5be87b5ed3008f3373b1f96722b9bd Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Sat Dec 19 11:02:21 2015 +0100 mesa/formatquery: support for IMAGE_FORMAT_COMPATIBILITY_TYPE From arb_internalformat_query2 spec: "IMAGE_FORMAT_COMPATIBILITY_TYPE: The matching criteria use for the resource when used as an image textures is returned in <params>. This is equivalent to calling GetTexParameter with <value> set to IMAGE_FORMAT_COMPATIBILITY_TYPE." Current implementation of GetTexParameter for this case returns a field of a texture object, so the support of this pname was implemented creating a temporal texture object and returning that value. It is worth to mention that right now that field is not reassigned after initialization. So it is somehow hardcoded. An alternative option would be return that value. That doesn't seems really scalable though. v2: use _mesa_has## instead of direct ctx->Extensions access (Nanley Chery) Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e98a3c799f5db65966f87c5d59552ae22a001084 Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Sat Dec 19 12:45:43 2015 +0100 mesa/formatquery: handle unmodified buffer for SAMPLES on the 64-bit query From arb_internalformat_query2 spec: " If <internalformat> is not color-renderable, depth-renderable, or stencil-renderable (as defined in section 4.4.4), or if <target> does not support multiple samples (ie other than TEXTURE_2D_MULTISAMPLE, TEXTURE_2D_MULTISAMPLE_ARRAY, or RENDERBUFFER), <params> is not modified." So there are cases where the buffer should not be modified. As the 64-bit query is a wrapper over the 32-bit query, we can't just copy the values to the equivalent 32-bit buffer, as that would fail if the original params contained values greater that INT_MAX. So we need to copy-back only the values that got modified by the 32-bit query. We do that by filling the temporal buffer by negatives, as the 32-bit query should not return negative values ever. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=580816b74723af481dd85c845caca8aa41274ed5 Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Thu Nov 19 11:37:37 2015 +0100 mesa/formatquery: initial implementation for GetInternalformati64v It just does a wrapping on the existing 32-bit GetInternalformativ. We will maintain the 32-bit query as default as it is likely that it would be the one most used. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7241e1b5f4b9882425517b3d0131114119a7fdc6 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 17:21:21 2015 +0100 mesa/formatquery: Added INTERNALFORMAT_{X}_{SIZE,TYPE} <pname> queries From the ARB_internalformat_query2 spec: "- INTERNALFORMAT_RED_SIZE - INTERNALFORMAT_GREEN_SIZE - INTERNALFORMAT_BLUE_SIZE - INTERNALFORMAT_ALPHA_SIZE - INTERNALFORMAT_DEPTH_SIZE - INTERNALFORMAT_STENCIL_SIZE - INTERNALFORMAT_SHARED_SIZE For uncompressed internal formats, queries of these values return the actual resolutions that would be used for storing image array components for the resource. For compressed internal formats, the resolutions returned specify the component resolution of an uncompressed internal format that produces an image of roughly the same quality as the compressed algorithm. For textures this query will return the same information as querying GetTexLevelParameter{if}v for TEXTURE_*_SIZE would return. If the internal format is unsupported, or if a particular component is not present in the format, 0 is written to <params>. - INTERNALFORMAT_RED_TYPE - INTERNALFORMAT_GREEN_TYPE - INTERNALFORMAT_BLUE_TYPE - INTERNALFORMAT_ALPHA_TYPE - INTERNALFORMAT_DEPTH_TYPE - INTERNALFORMAT_STENCIL_TYPE For uncompressed internal formats, queries for these values return the data type used to store the component. For compressed internal formats the types returned specify how components are interpreted after decompression. For textures this query returns the same information as querying GetTexLevelParameter{if}v for TEXTURE_*TYPE would return. Possible values return include, NONE, SIGNED_NORMALIZED, UNSIGNED_NORMALIZED, FLOAT, INT, UNSIGNED_INT, representing missing, signed normalized fixed point, unsigned normalized fixed point, floating-point, signed unnormalized integer and unsigned unnormalized integer components. NONE is returned for all component types if the format is unsupported." Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=675418182b822810e1371407740d1a9793a812d3 Author: Antia Puentes <apuen...@igalia.com> Date: Tue Dec 1 19:34:21 2015 +0100 mesa/main: Extend _mesa_get_format_bits to accept new pnames The new pnames accepted by the function are: - INTERNALFORMAT_RED_SIZE - INTERNALFORMAT_GREEN_SIZE - INTERNALFORMAT_BLUE_SIZE - INTERNALFORMAT_ALPHA_SIZE - INTERNALFORMAT_DEPTH_SIZE - INTERNALFORMAT_STENCIL_SIZE It will be used by the ARB_internalformat_query2 implementation to implement those pnames. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a8dae62478377226bf63fcc69629daa0e80a97d Author: Antia Puentes <apuen...@igalia.com> Date: Mon Nov 30 20:26:30 2015 +0100 mesa/main: Extend _mesa_base_format_has_channel to accept new pnames The new pnames accepted by the function are: - INTERNALFORMAT_RED_SIZE - INTERNALFORMAT_GREEN_SIZE - INTERNALFORMAT_BLUE_SIZE - INTERNALFORMAT_ALPHA_SIZE - INTERNALFORMAT_DEPTH_SIZE - INTERNALFORMAT_STENCIL_SIZE - INTERNALFORMAT_RED_TYPE - INTERNALFORMAT_GREEN_TYPE - INTERNALFORMAT_BLUE_TYPE - INTERNALFORMAT_ALPHA_TYPE - INTERNALFORMAT_DEPTH_TYPE - INTERNALFORMAT_STENCIL_TYPE It will be used by the ARB_internalformat_query2 implementation to implement those pnames. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1c789fa00ba7216161bcee2691936fd7312d74c Author: Antia Puentes <apuen...@igalia.com> Date: Mon Nov 30 20:37:24 2015 +0100 mesa/main: Make legal_get_tex_level_parameter_target public It will be used by the ARB_internalformat_query2 implementation to check if the target is valid for those <pnames> that are said in the spec that should return the same values than the 'glGetTexLevelParameter{if}v' function: - INTERNALFORMAT_RED_SIZE - INTERNALFORMAT_GREEN_SIZE - INTERNALFORMAT_BLUE_SIZE - INTERNALFORMAT_ALPHA_SIZE - INTERNALFORMAT_DEPTH_SIZE - INTERNALFORMAT_STENCIL_SIZE - INTERNALFORMAT_SHARED_SIZE - INTERNALFORMAT_RED_TYPE - INTERNALFORMAT_GREEN_TYPE - INTERNALFORMAT_BLUE_TYPE - INTERNALFORMAT_ALPHA_TYPE - INTERNALFORMAT_DEPTH_TYPE - INTERNALFORMAT_STENCIL_TYPE - IMAGE_FORMAT_COMPATIBILITY_TYPE Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eacb2c971ed2aa0a2f51f47d8b1667a5edf97a00 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Sat Dec 19 17:03:18 2015 +0100 mesa/formatquery: Added INTERNALFORMAT_PREFERRED pname Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=56ec2dfcb1b9e2756d550dfad9008597b1951997 Author: Antia Puentes <apuen...@igalia.com> Date: Tue Dec 22 15:14:23 2015 +0100 mesa/formatquery: Added the INTERNALFORMAT_SUPPORTED <pname> query Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4722abc6300249e5afeff54e1286d2261c26bd28 Author: Antia Puentes <apuen...@igalia.com> Date: Tue Dec 22 15:07:57 2015 +0100 mesa/formatquery: Added a func to check <internalformat> supported From the ARB_internalformat_query2 specification: "The INTERNALFORMAT_SUPPORTED <pname> can be used to determine if the internal format is supported, and the other <pnames> are defined in terms of whether or not the format is supported." v2: Consider also FBO base formats when checking if the internalformat is supported. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f6e3a03704c67dd5a271a4e43645355c5199cc7 Author: Antia Puentes <apuen...@igalia.com> Date: Sat Dec 19 16:02:05 2015 +0100 mesa/formatquery: Added func to check if the 'resource' is supported Checks that the 'resource', as defined by the ARB_internalformat_query2 specification, is supported by the implementation for those 'pnames' that require this check. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95392cfa9d815ec985ba14dfe347b30d232ed9e7 Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Fri Nov 20 10:34:50 2015 +0100 mesa/main: not fill mesa_error on _mesa_legal_texture_base_format_for_target This would allow to use this method if you are just querying if it is allowed, like for arb_internalformat_query2. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aaf5ad513b790a2d0f97dd757ff69ea78c375529 Author: Antia Puentes <apuen...@igalia.com> Date: Sun Nov 15 21:31:36 2015 +0100 mesa/teximage: Make _mesa_format_no_online_compression public It will be used by the ARB_internalformat_query2 implementation to check if a certain compressed 'internalformat' is supported by texture 'targets'. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5eef3558231854f52059e1745b2f2a0cfdc816a4 Author: Antia Puentes <apuen...@igalia.com> Date: Wed Nov 4 16:51:01 2015 +0100 mesa/teximage: make public is_renderable_texture_format It will be used by the ARB_internalformat_query2 implementation to check if the 'internalformat' passed is supported by texture MULTISAMPLE 'targets'. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5d27bc5ddb9f30153e02f4ae1096c8d6eda3df5 Author: Antia Puentes <apuen...@igalia.com> Date: Tue Nov 17 18:02:12 2015 +0100 mesa/main: Added empty skeleton of glGetInternalformati64v Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2453bba504ef2e88c5ab3737f159314572527a46 Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Thu Nov 19 11:26:05 2015 +0100 mesa: Add dispatch and extension XML for GL_ARB_internalformat_query2 Equivalent to commit bda540 (that added GL_ARB_internalformat_query) v2: include the new xml to to API_XML list at Makefile.am (Emil Velikov) Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d432337e2dc0759563c8e1ef573aa3805aa2eed8 Author: Antia Puentes <apuen...@igalia.com> Date: Thu Dec 17 16:08:34 2015 +0100 mesa/formatquery: Added boilerplate code to extend GetInternalformativ The goal is to extend the GetInternalformativ query to implement the ARB_internalformat_query2 specification, keeping the behaviour defined by the ARB_internalformat_query if ARB_internalformat_query2 is not supported. v2: Don't require ARB_internalformat_query when profile is GLES3. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=806bc2bf223c03c488de5549582141824dcbbc40 Author: Antia Puentes <apuen...@igalia.com> Date: Wed Dec 16 20:46:49 2015 +0100 mesa/formatquery: Added a func to check if the <target> is supported From the ARB_internalformat_query2 spec: "If the particular <target> and <internalformat> combination do not make sense, or if a particular type of <target> is not supported by the implementation the "unsupported" answer should be given. This is not an error." This function checks if the <target> is supported by the implementation. v2: Allow RENDERBUFFER targets also on GLES 3 profiles. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4af3e5e9f1f80e18b5f9b198f9bd652936170908 Author: Antia Puentes <apuen...@igalia.com> Date: Wed Dec 16 20:36:31 2015 +0100 mesa/formatquery: Added function to set 'unsupported' responses The ARB_internalformat_query2 specification defines which is the reponse best representing "not supported" or "not applicable" for each <pname>. Queries for unsupported features, targets, internalformats, combinations of: target and internalformat, target and pname, pname and internalformat, do not return an error but the corresponding 'unsupported' response. We will use that response as the default answer. For SAMPLES the 'unsupported' response is to not modify the 'params' buffer. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6434f41cc580f75909afbfcd6fa71e23706f96f Author: Antia Puentes <apuen...@igalia.com> Date: Wed Dec 16 20:31:15 2015 +0100 mesa/formatquery: Added function to validate parameters Handles the cases where an error should be returned according to the ARB_internalformat_query and ARB_internalformat_query2 specifications. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b89463cdfda8ff432e466d34524f54e1f5c595a7 Author: Antia Puentes <apuen...@igalia.com> Date: Wed Oct 21 14:51:09 2015 +0200 mesa/main: Add extension tracking bit for ARB_internalformat_query2 Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a347a0f53fbdd9b607d7eae4a483e62f82c68cb1 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Wed Dec 16 18:11:36 2015 +0100 mesa: Completely remove QuerySamplesForFormat from driver func table At this point, all uses have been replaced by the more general hook QueryInternalFormat, introduced by ARB_internalformat_query2. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=993d7345b7c356d96f3d24865d83ff368bc6fc55 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Wed Dec 16 17:49:29 2015 +0100 mesa/formatquery: Use new driver hook QueryInternalFormat Implements SAMPLES and NUM_SAMPLE_COUNTS queries using the new generic driver call QueryInternalFormat, which is being introduced as replacement of QuerySamplesForFormat to support ARB_internalformat_query2. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25ee5c60dcb49e68c80eb5157769ccb655d647fa Author: Eduardo Lima Mitev <el...@igalia.com> Date: Wed Dec 16 17:32:19 2015 +0100 mesa/formatquery: Remove tracking of number of elements in the response Currently, the number of integers returned in the response to GetInternalFormativ is being tracked by a 'count' variable. This is so only the modified elements from the temporary buffer are copied into the original user buffer. However, with the introduction of ARB_internalformat_query2, keeping track of 'count' would complicate the code a lot, considering the high number of queries. So, we propose to forget about tracking count, and move all the 16 elements in the temporary buffer, back to the user buffer (clamped to user buffer size of course). This is basically a trade-off between performance and code clarity. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f0b2ce8ec139cfb54db014949db0345461aff94 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Nov 24 22:32:00 2015 +0100 mesa/multisample: Check sample count using the new driver hook Use QueryInternalFormat instead of QuerySamplesForFormat to obtain the highest supported sample. QuerySamplesForFormat is to be removed. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee31b0b1d0f9394f1a41f71c0bf743a59ba7947d Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Nov 24 22:22:00 2015 +0100 st/format: Replace QuerySamplesForFormat by new QueryInternalFormat hook The previous code for SAMPLES and NUM_SAMPLE_COUNTS is reused as a private function. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82be7735f32776e76300de3602a72fc236b7261e Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Nov 24 21:43:28 2015 +0100 i965/formatquery: Respond queries SAMPLES and NUM_SAMPLE_COUNTS This effectively disables old QuerySamplesForFormat driver hook, since it is never called by Mesa anymore. v2: Call brw_query_samples_for_format() with a dummy buffer to calculate num samples, to avoid modifying the original buffer. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2dabff9068a86a070615df587e4e9327b1d1ca6e Author: Eduardo Lima Mitev <el...@igalia.com> Date: Sat Nov 14 12:21:21 2015 +0100 i965: Move brw_query_samples_for_format() to brw_queryformat.c Now that there is a dedicated source file for internal format queries, this function belongs there. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=28144c4476343a5e2f679ce96ec72cddc5762b04 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Oct 27 16:16:24 2015 +0100 i965: Add boilerplate function for QueryInternalFormat driver hook By default, we call back the driver's hook fallback function that has generic implementations for the all the queries. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=45054f9702bd07cd293c1f6c1317eae9530cc4da Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Oct 27 15:58:59 2015 +0100 mesa: Add a default QueryInternalFormat() function for drivers This is a fallback function for drivers not implementing ARB_internalformat_query2. Reviewed-by: Dave Airlie <airl...@redhat.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=93d30c3de95a1d373285cd7353343817c23dbb64 Author: Eduardo Lima Mitev <el...@igalia.com> Date: Tue Oct 27 15:18:45 2015 +0100 mesa: Add QueryInternalFormat to device driver virtual table This new function queries different driver parameters for a particular target and texture format. It is basically a driver hook to support ARB_internalformat_query2. Since ARB_internalformat_query2 introduced several new query parameters over ARB_internalformat_query, having one driver hook for each parameter is no longer feasible. So this is the generic entry-point for calls to glGetInternalFormativ and glGetInternalFormati64v. Reviewed-by: Dave Airlie <airl...@redhat.com> _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit