* "if a particular type of <target> is not supported by the
* implementation the "unsupported" answer should be given.
* This is not an error."
+ *
+ * For OpenGL ES, queries can only be used with GL_RENDERBUFFER or MS.
*/
switch(target){
+ case GL_TEXTURE_1D:
case GL_TEXTURE_2D:
case GL_TEXTURE_3D:
- break;
-
- case GL_TEXTURE_1D:
if (!_mesa_is_desktop_gl(ctx))
return false;
break;
break;
case GL_TEXTURE_2D_ARRAY:
- if (!(_mesa_has_EXT_texture_array(ctx) || _mesa_is_gles3(ctx)))
+ if (!_mesa_has_EXT_texture_array(ctx))
return false;
break;
case GL_TEXTURE_CUBE_MAP:
- if (!_mesa_has_ARB_texture_cube_map(ctx))
+ if (ctx->API != API_OPENGL_CORE && !_mesa_has_ARB_texture_cube_map(ctx))
return false;
break;
break;
case GL_TEXTURE_RECTANGLE:
- if (!_mesa_has_NV_texture_rectangle(ctx))
+ if (!_mesa_has_ARB_texture_rectangle(ctx))
return false;
break;
*/
GLint buffer[1];
- /* At this point a internalformat is valid if it is valid as a texture or
+ /* At this point an internalformat is valid if it is valid as a texture or
* as a renderbuffer format. The checks are different because those methods
* return different values when passing non supported internalformats */
if (_mesa_base_tex_format(ctx, internalformat) < 0 &&
break;
}
- case GL_READ_PIXELS_TYPE: {
+ case GL_READ_PIXELS_TYPE:
+ case GL_TEXTURE_IMAGE_TYPE:
+ case GL_GET_TEXTURE_IMAGE_TYPE: {
GLenum base_format = _mesa_base_tex_format(ctx, internalFormat);
if (base_format > 0)
params[0] = _mesa_generic_type_for_internal_format(internalFormat);
break;
}
+ case GL_TEXTURE_IMAGE_FORMAT:
+ case GL_GET_TEXTURE_IMAGE_FORMAT: {
+ GLenum format = GL_NONE;
+ GLenum base_format = _mesa_base_tex_format(ctx, internalFormat);
+ if (base_format > 0) {
+ if (_mesa_is_enum_format_integer(internalFormat))
+ format = _mesa_base_format_to_integer_format(base_format);
+ else
+ format = base_format;
+ }
+
+ params[0] = format;
+ break;
+ }
+
case GL_MANUAL_GENERATE_MIPMAP:
case GL_AUTO_GENERATE_MIPMAP:
case GL_SRGB_READ:
* arb_internalformat_query2 spec.
*/
static GLenum
-equivalentSizePname(GLenum target,
- GLenum pname)
+_equivalent_size_pname(GLenum target,
+ GLenum pname)
{
switch (target) {
case GL_TEXTURE_1D:
* per-se, so we can't just call _mesa_get_texture_dimension directly.
*/
static GLint
-get_target_dimensions(GLenum target)
+_get_target_dimensions(GLenum target)
{
switch(target) {
case GL_TEXTURE_BUFFER:
* <skip>."
*/
static GLint
-get_min_dimensions(GLenum pname)
+_get_min_dimensions(GLenum pname)
{
switch(pname) {
case GL_MAX_WIDTH:
* dimensions.
*/
static bool
-is_multisample_target(GLenum target)
+_is_multisample_target(GLenum target)
{
switch(target) {
case GL_TEXTURE_2D_MULTISAMPLE:
* "Since multisampling is not supported for signed and unsigned
* integer internal formats, the value of NUM_SAMPLE_COUNTS will be
* zero for such formats.
+ *
+ * Since OpenGL ES 3.1 adds support for multisampled integer formats, we
+ * have to check the version for 30 exactly.
*/
if (pname == GL_NUM_SAMPLE_COUNTS && ctx->API == API_OPENGLES2 &&
ctx->Version == 30 && _mesa_is_enum_format_integer(internalformat)) {
* format for representing resources of the specified <internalformat> is
* returned in <params>.
*
- * Therefore, we let the driver answer.
+ * Therefore, we let the driver answer. Note that if we reach this
+ * point, it means that the internalformat is supported, so the driver
+ * is called just to try to get a preferred format. If not supported,
+ * GL_NONE was already returned and the driver is not called.
*/
ctx->Driver.QueryInternalFormat(ctx, target, internalformat, pname,
buffer);
switch (pname) {
case GL_INTERNALFORMAT_DEPTH_SIZE:
- if (!_mesa_has_ARB_depth_texture(ctx) &&
+ if (ctx->API != API_OPENGL_CORE &&
+ !_mesa_has_ARB_depth_texture(ctx) &&
target != GL_RENDERBUFFER &&
target != GL_TEXTURE_BUFFER)
goto end;
* "If the resource does not have at least two dimensions, or if the
* resource is unsupported, zero is returned."
*/
- dimensions = get_target_dimensions(target);
- min_dimensions = get_min_dimensions(pname);
+ dimensions = _get_target_dimensions(target);
+ min_dimensions = _get_min_dimensions(pname);
if (dimensions < min_dimensions)
goto end;
- get_pname = equivalentSizePname(target, pname);
+ get_pname = _equivalent_size_pname(target, pname);
if (get_pname == 0)
goto end;
* returned as MAX_HEIGHT or MAX_DEPTH */
for (i = 0; i < 4; i++) {
if (max_dimensions_pnames[i] == GL_SAMPLES &&
- !is_multisample_target(target))
+ !_is_multisample_target(target))
continue;
_mesa_GetInternalformativ(target, internalformat,
break;
case GL_TEXTURE_IMAGE_FORMAT:
- /* @TODO */
- break;
-
- case GL_TEXTURE_IMAGE_TYPE:
- /* @TODO */
- break;
-
case GL_GET_TEXTURE_IMAGE_FORMAT:
- /* @TODO */
- break;
-
+ case GL_TEXTURE_IMAGE_TYPE:
case GL_GET_TEXTURE_IMAGE_TYPE:
- /* @TODO */
+ ctx->Driver.QueryInternalFormat(ctx, target, internalformat, pname,
+ buffer);
break;
case GL_MIPMAP:
* no pname can return a negative value, we fill params32 with negative
* values as reference values, that can be used to know what copy-back to
* params */
- memset(params32, -1, 16);
+ for (i = 0; i < realSize; i++)
+ params32[i] = -1;
/* For GL_MAX_COMBINED_DIMENSIONS we need to get back 2 32-bit integers,
* and at the same time we only need 2. So for that pname, we call the
projects / mesa.git / blobdiff