Skip to content

S
swiftshader
Commit 0300e3c7 by Alexis Hetu Committed by Alexis Hétu
Options

Implement simple OpenGL ES 3.0 parameter checks

Added some "low hanging fruit" implementations and quick validation checks for a portion of the GLES 3.0 API functions. Change-Id: I003031091bc2c2c32919896e86e38b5f1f43c555 Reviewed-on: https://swiftshader-review.googlesource.com/2610Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 52e18431
Showing with 1094 additions and 11 deletions
src/OpenGL/libGLESv2/Context.cpp
...@@ -1585,7 +1585,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params) ...@@ -1585,7 +1585,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
break; break;
case GL_MAX_COLOR_ATTACHMENTS: // integer, at least 8 case GL_MAX_COLOR_ATTACHMENTS: // integer, at least 8
UNIMPLEMENTED(); UNIMPLEMENTED();
*params = 8; *params = IMPLEMENTATION_MAX_COLOR_ATTACHMENTS;
break; break;
case GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS: // integer, at least 1 case GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS: // integer, at least 1
UNIMPLEMENTED(); UNIMPLEMENTED();
......
src/OpenGL/libGLESv2/Texture.h
...@@ -43,7 +43,8 @@ enum ...@@ -43,7 +43,8 @@ enum
IMPLEMENTATION_MAX_TEXTURE_SIZE = 1 << (MIPMAP_LEVELS - 1), IMPLEMENTATION_MAX_TEXTURE_SIZE = 1 << (MIPMAP_LEVELS - 1),
IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE = 1 << (MIPMAP_LEVELS - 1), IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE = 1 << (MIPMAP_LEVELS - 1),
IMPLEMENTATION_MAX_RENDERBUFFER_SIZE = OUTLINE_RESOLUTION, IMPLEMENTATION_MAX_RENDERBUFFER_SIZE = OUTLINE_RESOLUTION,
IMPLEMENTATION_MAX_SAMPLES = 4 IMPLEMENTATION_MAX_SAMPLES = 4,
IMPLEMENTATION_MAX_COLOR_ATTACHMENTS = 8,
}; };
class Texture : public egl::Texture class Texture : public egl::Texture
......
src/OpenGL/libGLESv2/libGLESv2.cpp
...@@ -211,7 +211,8 @@ static FormatMap BuildFormatMap3D() ...@@ -211,7 +211,8 @@ static FormatMap BuildFormatMap3D()
InsertFormatMapping(map, GL_SRGB8_NV, GL_RGB, GL_UNSIGNED_BYTE); InsertFormatMapping(map, GL_SRGB8_NV, GL_RGB, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGB565, GL_RGB, GL_UNSIGNED_BYTE); InsertFormatMapping(map, GL_RGB565, GL_RGB, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5); InsertFormatMapping(map, GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
InsertFormatMapping(map, GL_RGB16F_EXT, GL_HALF_FLOAT_OES, GL_FLOAT); InsertFormatMapping(map, GL_RGB16F_EXT, GL_RGB, GL_HALF_FLOAT_OES);
InsertFormatMapping(map, GL_RGB16F_EXT, GL_RGB, GL_FLOAT);
InsertFormatMapping(map, GL_RGB32F_EXT, GL_RGB, GL_FLOAT); InsertFormatMapping(map, GL_RGB32F_EXT, GL_RGB, GL_FLOAT);
InsertFormatMapping(map, GL_RGBA8_OES, GL_RGBA, GL_UNSIGNED_BYTE); InsertFormatMapping(map, GL_RGBA8_OES, GL_RGBA, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_SRGB8_ALPHA8_EXT, GL_RGBA, GL_UNSIGNED_BYTE); InsertFormatMapping(map, GL_SRGB8_ALPHA8_EXT, GL_RGBA, GL_UNSIGNED_BYTE);
......
src/OpenGL/libGLESv2/libGLESv3.cpp
// SwiftShader Software Renderer
//
// Copyright(c) 2015 Google Inc.
//
// All rights reserved. No part of this software may be copied, distributed, transmitted,
// transcribed, stored in a retrieval system, translated into any human or computer
// language by any means, or disclosed to third parties without the explicit written
// agreement of Google Inc. Without such an agreement, no rights or licenses, express
// or implied, including but not limited to any patent rights, are granted to you.
//
// libGLESv3.cpp: Implements the exported OpenGL ES 3.0 functions.
#include "main.h"
#include "Framebuffer.h"
#include "Texture.h"
#include "common/debug.h" #include "common/debug.h"
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h> #include <GLES3/gl3.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
typedef std::pair<GLenum, GLenum> InternalFormatTypePair;
typedef std::map<InternalFormatTypePair, GLenum> FormatMap;
// A helper function to insert data into the format map with fewer characters.
static void InsertFormatMapping(FormatMap& map, GLenum internalformat, GLenum format, GLenum type)
{
map[InternalFormatTypePair(internalformat, type)] = format;
}
static bool validImageSize(GLint level, GLsizei width, GLsizei height)
{
if(level < 0 || level >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || width < 0 || height < 0)
{
return false;
}
return true;
}
static bool validateSubImageParams(bool compressed, GLsizei width, GLsizei height, GLint xoffset, GLint yoffset, GLenum target, GLint level, GLenum format, es2::Texture *texture)
{
if(!texture)
{
return error(GL_INVALID_OPERATION, false);
}
if(compressed != texture->isCompressed(target, level))
{
return error(GL_INVALID_OPERATION, false);
}
if(format != GL_NONE && format != texture->getFormat(target, level))
{
return error(GL_INVALID_OPERATION, false);
}
if(compressed)
{
if((width % 4 != 0 && width != texture->getWidth(target, 0)) ||
(height % 4 != 0 && height != texture->getHeight(target, 0)))
{
return error(GL_INVALID_OPERATION, false);
}
}
if(xoffset + width > texture->getWidth(target, level) ||
yoffset + height > texture->getHeight(target, level))
{
return error(GL_INVALID_VALUE, false);
}
return true;
}
static bool validateSubImageParams(bool compressed, GLsizei width, GLsizei height, GLsizei depth, GLint xoffset, GLint yoffset, GLint zoffset, GLenum target, GLint level, GLenum format, es2::Texture *texture)
{
if(!texture)
{
return error(GL_INVALID_OPERATION, false);
}
if(compressed != texture->isCompressed(target, level))
{
return error(GL_INVALID_OPERATION, false);
}
if(format != GL_NONE && format != texture->getFormat(target, level))
{
return error(GL_INVALID_OPERATION, false);
}
if(compressed)
{
if((width % 4 != 0 && width != texture->getWidth(target, 0)) ||
(height % 4 != 0 && height != texture->getHeight(target, 0)) ||
(depth % 4 != 0 && depth != texture->getDepth(target, 0)))
{
return error(GL_INVALID_OPERATION, false);
}
}
if(xoffset + width > texture->getWidth(target, level) ||
yoffset + height > texture->getHeight(target, level) ||
zoffset + depth > texture->getDepth(target, level))
{
return error(GL_INVALID_VALUE, false);
}
return true;
}
static bool validateColorBufferFormat(GLenum textureFormat, GLenum colorbufferFormat)
{
switch(textureFormat)
{
case GL_ALPHA:
if(colorbufferFormat != GL_ALPHA &&
colorbufferFormat != GL_RGBA &&
colorbufferFormat != GL_RGBA4 &&
colorbufferFormat != GL_RGB5_A1 &&
colorbufferFormat != GL_RGBA8)
{
return error(GL_INVALID_OPERATION, false);
}
break;
case GL_LUMINANCE:
case GL_RGB:
if(colorbufferFormat != GL_RGB &&
colorbufferFormat != GL_RGB565 &&
colorbufferFormat != GL_RGB8 &&
colorbufferFormat != GL_RGBA &&
colorbufferFormat != GL_RGBA4 &&
colorbufferFormat != GL_RGB5_A1 &&
colorbufferFormat != GL_RGBA8)
{
return error(GL_INVALID_OPERATION, false);
}
break;
case GL_LUMINANCE_ALPHA:
case GL_RGBA:
if(colorbufferFormat != GL_RGBA &&
colorbufferFormat != GL_RGBA4 &&
colorbufferFormat != GL_RGB5_A1 &&
colorbufferFormat != GL_RGBA8)
{
return error(GL_INVALID_OPERATION, false);
}
break;
case GL_ETC1_RGB8_OES:
return error(GL_INVALID_OPERATION, false);
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
if(S3TC_SUPPORT)
{
return error(GL_INVALID_OPERATION, false);
}
else
{
return error(GL_INVALID_ENUM, false);
}
case GL_DEPTH_COMPONENT:
case GL_DEPTH_STENCIL:
return error(GL_INVALID_OPERATION, false);
default:
return error(GL_INVALID_ENUM, false);
}
return true;
}
static FormatMap BuildFormatMap3D()
{
FormatMap map;
// Internal format | Format | Type
InsertFormatMapping(map, GL_RGB, GL_RGB, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
InsertFormatMapping(map, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
InsertFormatMapping(map, GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
InsertFormatMapping(map, GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_R8, GL_RED, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_R8_SNORM, GL_RED, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_R16F, GL_RED, GL_HALF_FLOAT);
InsertFormatMapping(map, GL_R16F, GL_RED, GL_FLOAT);
InsertFormatMapping(map, GL_R32F, GL_RED, GL_FLOAT);
InsertFormatMapping(map, GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_R8I, GL_RED_INTEGER, GL_BYTE);
InsertFormatMapping(map, GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT);
InsertFormatMapping(map, GL_R16I, GL_RED_INTEGER, GL_SHORT);
InsertFormatMapping(map, GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT);
InsertFormatMapping(map, GL_R32I, GL_RED_INTEGER, GL_INT);
InsertFormatMapping(map, GL_RG8, GL_RG, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RG8_SNORM, GL_RG, GL_BYTE);
InsertFormatMapping(map, GL_R16F, GL_RED, GL_HALF_FLOAT);
InsertFormatMapping(map, GL_R16F, GL_RED, GL_FLOAT);
InsertFormatMapping(map, GL_RG32F, GL_RG, GL_FLOAT);
InsertFormatMapping(map, GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RG8I, GL_RG_INTEGER, GL_BYTE);
InsertFormatMapping(map, GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT);
InsertFormatMapping(map, GL_RG16I, GL_RG_INTEGER, GL_SHORT);
InsertFormatMapping(map, GL_RG32UI, GL_RG_INTEGER, GL_UNSIGNED_INT);
InsertFormatMapping(map, GL_RG32I, GL_RG_INTEGER, GL_INT);
InsertFormatMapping(map, GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_SRGB8, GL_RGB, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGB565, GL_RGB, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
InsertFormatMapping(map, GL_RGB8_SNORM, GL_RGB, GL_BYTE);
InsertFormatMapping(map, GL_R11F_G11F_B10F, GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV);
InsertFormatMapping(map, GL_R11F_G11F_B10F, GL_RGB, GL_HALF_FLOAT);
InsertFormatMapping(map, GL_R11F_G11F_B10F, GL_RGB, GL_FLOAT);
InsertFormatMapping(map, GL_RGB9_E5, GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV);
InsertFormatMapping(map, GL_RGB9_E5, GL_RGB, GL_HALF_FLOAT);
InsertFormatMapping(map, GL_RGB9_E5, GL_RGB, GL_FLOAT);
InsertFormatMapping(map, GL_RGB16F, GL_RGB, GL_HALF_FLOAT);
InsertFormatMapping(map, GL_RGB16F, GL_RGB, GL_FLOAT);
InsertFormatMapping(map, GL_RGB32F, GL_RGB, GL_FLOAT);
InsertFormatMapping(map, GL_RGB8UI, GL_RGB_INTEGER, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGB8I, GL_RGB_INTEGER, GL_BYTE);
InsertFormatMapping(map, GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT);
InsertFormatMapping(map, GL_RGB16I, GL_RGB_INTEGER, GL_SHORT);
InsertFormatMapping(map, GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT);
InsertFormatMapping(map, GL_RGB32I, GL_RGB_INTEGER, GL_INT);
InsertFormatMapping(map, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
InsertFormatMapping(map, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV);
InsertFormatMapping(map, GL_RGBA4, GL_RGBA, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGBA4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
InsertFormatMapping(map, GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV);
InsertFormatMapping(map, GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT);
InsertFormatMapping(map, GL_RGBA16F, GL_RGBA, GL_FLOAT);
InsertFormatMapping(map, GL_RGBA32F, GL_RGBA, GL_FLOAT);
InsertFormatMapping(map, GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE);
InsertFormatMapping(map, GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE);
InsertFormatMapping(map, GL_RGB10_A2UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV);
InsertFormatMapping(map, GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT);
InsertFormatMapping(map, GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT);
InsertFormatMapping(map, GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT);
InsertFormatMapping(map, GL_RGBA32I, GL_RGBA_INTEGER, GL_INT);
InsertFormatMapping(map, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT);
InsertFormatMapping(map, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT);
InsertFormatMapping(map, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT);
InsertFormatMapping(map, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT);
InsertFormatMapping(map, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);
InsertFormatMapping(map, GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV);
return map;
}
static bool ValidateType3D(GLenum type)
{
switch(type)
{
case GL_UNSIGNED_BYTE:
case GL_BYTE:
case GL_UNSIGNED_SHORT:
case GL_SHORT:
case GL_UNSIGNED_INT:
case GL_INT:
case GL_HALF_FLOAT:
case GL_FLOAT:
case GL_UNSIGNED_SHORT_5_6_5:
case GL_UNSIGNED_SHORT_4_4_4_4:
case GL_UNSIGNED_SHORT_5_5_5_1:
case GL_UNSIGNED_INT_2_10_10_10_REV:
case GL_UNSIGNED_INT_10F_11F_11F_REV:
case GL_UNSIGNED_INT_5_9_9_9_REV:
case GL_UNSIGNED_INT_24_8:
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
return true;
default:
break;
}
return false;
}
static bool ValidateFormat3D(GLenum format)
{
switch(format)
{
case GL_RED:
case GL_RG:
case GL_RGB:
case GL_RGBA:
case GL_DEPTH_COMPONENT:
case GL_DEPTH_STENCIL:
case GL_LUMINANCE_ALPHA:
case GL_LUMINANCE:
case GL_ALPHA:
case GL_RED_INTEGER:
case GL_RG_INTEGER:
case GL_RGB_INTEGER:
case GL_RGBA_INTEGER:
return true;
default:
break;
}
return false;
}
static bool ValidateInternalFormat3D(GLenum internalformat, GLenum format, GLenum type)
{
static const FormatMap formatMap = BuildFormatMap3D();
FormatMap::const_iterator iter = formatMap.find(InternalFormatTypePair(internalformat, type));
if(iter != formatMap.end())
{
return iter->second == format;
}
return false;
}
static bool ValidateQueryTarget(GLenum target)
{
switch(target)
{
case GL_ANY_SAMPLES_PASSED:
case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
break;
default:
return false;
}
return true;
}
static bool ValidateBufferTarget(GLenum target)
{
switch(target)
{
case GL_ARRAY_BUFFER:
case GL_COPY_READ_BUFFER:
case GL_COPY_WRITE_BUFFER:
case GL_ELEMENT_ARRAY_BUFFER:
case GL_PIXEL_PACK_BUFFER:
case GL_PIXEL_UNPACK_BUFFER:
case GL_TRANSFORM_FEEDBACK_BUFFER:
case GL_UNIFORM_BUFFER:
break;
default:
return false;
}
return true;
}
extern "C" extern "C"
{ {
void GL_APIENTRY glReadBuffer(GLenum src) void GL_APIENTRY glReadBuffer(GLenum src)
{ {
TRACE("(GLenum src = 0x%X)", src);
es2::Context *context = es2::getContext();
switch(src)
{
case GL_BACK:
case GL_NONE:
break;
case GL_COLOR_ATTACHMENT0:
case GL_COLOR_ATTACHMENT1:
case GL_COLOR_ATTACHMENT2:
case GL_COLOR_ATTACHMENT3:
case GL_COLOR_ATTACHMENT4:
case GL_COLOR_ATTACHMENT5:
case GL_COLOR_ATTACHMENT6:
case GL_COLOR_ATTACHMENT7:
case GL_COLOR_ATTACHMENT8:
case GL_COLOR_ATTACHMENT9:
case GL_COLOR_ATTACHMENT10:
case GL_COLOR_ATTACHMENT11:
case GL_COLOR_ATTACHMENT12:
case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15:
if((src - GL_COLOR_ATTACHMENT0) >= es2::IMPLEMENTATION_MAX_COLOR_ATTACHMENTS)
{
return error(GL_INVALID_ENUM);
}
break;
default:
error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices) void GL_APIENTRY glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)
{ {
TRACE("(GLenum mode = 0x%X, GLuint start = %d, GLuint end = %d, "
"GLsizei count = %d, GLenum type = 0x%x, const void* indices = 0x%0.8p)",
mode, start, end, count, type, indices);
switch(mode)
{
case GL_POINTS:
case GL_LINES:
case GL_LINE_LOOP:
case GL_LINE_STRIP:
case GL_TRIANGLES:
case GL_TRIANGLE_FAN:
case GL_TRIANGLE_STRIP:
break;
default:
return error(GL_INVALID_ENUM);
}
switch(type)
{
case GL_UNSIGNED_BYTE:
case GL_UNSIGNED_SHORT:
case GL_UNSIGNED_INT:
break;
default:
return error(GL_INVALID_ENUM);
}
if((count < 0) || (end < start))
{
return error(GL_INVALID_VALUE);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels) void GL_APIENTRY glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
{ {
UNIMPLEMENTED(); TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "
"GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, "
"GLenum format = 0x%X, GLenum type = 0x%x, const GLvoid* pixels = 0x%0.8p)",
target, level, internalformat, width, height, depth, border, format, type, pixels);
switch(target)
{
case GL_TEXTURE_3D:
case GL_TEXTURE_2D_ARRAY:
break;
default:
return error(GL_INVALID_ENUM);
}
if(!ValidateType3D(type) || !ValidateFormat3D(format))
{
return error(GL_INVALID_ENUM);
}
if((level < 0) || (level >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS))
{
return error(GL_INVALID_VALUE);
}
const GLsizei maxSize3D = es2::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level;
if((width < 0) || (height < 0) || (depth < 0) || (width > maxSize3D) || (height > maxSize3D) || (depth > maxSize3D))
{
return error(GL_INVALID_VALUE);
}
if(border != 0)
{
return error(GL_INVALID_VALUE);
}
if(!ValidateInternalFormat3D(internalformat, format, type))
{
return error(GL_INVALID_OPERATION);
}
es2::Context *context = es2::getContext();
if(context)
{
es2::Texture3D *texture = context->getTexture3D();
if(!texture)
{
return error(GL_INVALID_OPERATION);
}
texture->setImage(level, width, height, depth, internalformat, type, context->getUnpackAlignment(), pixels);
}
} }
void GL_APIENTRY glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels) void GL_APIENTRY glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
{ {
UNIMPLEMENTED(); TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
"GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
"GLenum format = 0x%X, GLenum type = 0x%x, const GLvoid* pixels = 0x%0.8p)",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
switch(target)
{
case GL_TEXTURE_3D:
case GL_TEXTURE_2D_ARRAY:
break;
default:
return error(GL_INVALID_ENUM);
}
if(!ValidateType3D(type) || !ValidateFormat3D(format))
{
return error(GL_INVALID_ENUM);
}
if((level < 0) || (level >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS))
{
return error(GL_INVALID_VALUE);
}
if((width < 0) || (height < 0) || (depth < 0))
{
return error(GL_INVALID_VALUE);
}
es2::Context *context = es2::getContext();
if(context)
{
es2::Texture3D *texture = context->getTexture3D();
if(validateSubImageParams(false, width, height, depth, xoffset, yoffset, zoffset, target, level, format, texture))
{
texture->subImage(level, xoffset, yoffset, zoffset, width, height, depth, format, type, context->getUnpackAlignment(), pixels);
}
}
} }
void GL_APIENTRY glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height) void GL_APIENTRY glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
{ {
UNIMPLEMENTED(); TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
"GLint zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
target, level, xoffset, yoffset, zoffset, x, y, width, height);
switch(target)
{
case GL_TEXTURE_3D:
case GL_TEXTURE_2D_ARRAY:
break;
default:
return error(GL_INVALID_ENUM);
}
if((level < 0) || (level >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS))
{
return error(GL_INVALID_VALUE);
}
es2::Context *context = es2::getContext();
if(context)
{
es2::Framebuffer *framebuffer = context->getReadFramebuffer();
if(framebuffer->completeness() != GL_FRAMEBUFFER_COMPLETE)
{
return error(GL_INVALID_FRAMEBUFFER_OPERATION);
}
if(context->getReadFramebufferName() != 0 && framebuffer->getColorbuffer()->getSamples() > 1)
{
return error(GL_INVALID_OPERATION);
}
es2::Renderbuffer *source = framebuffer->getColorbuffer();
GLenum colorbufferFormat = source->getFormat();
es2::Texture3D *texture = context->getTexture3D();
if(!validateSubImageParams(false, width, height, 1, xoffset, yoffset, zoffset, target, level, GL_NONE, texture))
{
return;
}
GLenum textureFormat = texture->getFormat(target, level);
if(!validateColorBufferFormat(textureFormat, colorbufferFormat))
{
return;
}
texture->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, framebuffer);
}
} }
void GL_APIENTRY glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data) void GL_APIENTRY glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
{ {
UNIMPLEMENTED(); TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, "
"GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, const GLvoid* data = 0x%0.8p)",
target, level, internalformat, width, height, depth, border, imageSize, data);
switch(target)
{
case GL_TEXTURE_3D:
case GL_TEXTURE_2D_ARRAY:
break;
default:
return error(GL_INVALID_ENUM);
}
if((level < 0) || (level >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS))
{
return error(GL_INVALID_VALUE);
}
const GLsizei maxSize3D = es2::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level;
if((width < 0) || (height < 0) || (depth < 0) || (width > maxSize3D) || (height > maxSize3D) || (depth > maxSize3D) || (border != 0) || (imageSize < 0))
{
return error(GL_INVALID_VALUE);
}
switch(internalformat)
{
case GL_ETC1_RGB8_OES:
case GL_COMPRESSED_R11_EAC:
case GL_COMPRESSED_SIGNED_R11_EAC:
case GL_COMPRESSED_RG11_EAC:
case GL_COMPRESSED_SIGNED_RG11_EAC:
case GL_COMPRESSED_RGB8_ETC2:
case GL_COMPRESSED_SRGB8_ETC2:
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_RGBA8_ETC2_EAC:
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
break;
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
if(!S3TC_SUPPORT)
{
return error(GL_INVALID_ENUM);
}
break;
case GL_DEPTH_COMPONENT:
case GL_DEPTH_COMPONENT16:
case GL_DEPTH_COMPONENT32_OES:
case GL_DEPTH_STENCIL:
case GL_DEPTH24_STENCIL8:
return error(GL_INVALID_OPERATION);
default:
return error(GL_INVALID_ENUM);
}
if(imageSize != es2::ComputeCompressedSize(width, height, internalformat) * depth)
{
return error(GL_INVALID_VALUE);
}
es2::Context *context = es2::getContext();
if(context)
{
es2::Texture3D *texture = context->getTexture3D();
if(!texture)
{
return error(GL_INVALID_OPERATION);
}
texture->setCompressedImage(level, internalformat, width, height, depth, imageSize, data);
}
} }
void GL_APIENTRY glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data) void GL_APIENTRY glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
{ {
UNIMPLEMENTED(); TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
"GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
"GLenum format = 0x%X, GLsizei imageSize = %d, const void *data = 0x%0.8p)",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
switch(target)
{
case GL_TEXTURE_3D:
case GL_TEXTURE_2D_ARRAY:
break;
default:
return error(GL_INVALID_ENUM);
}
if(xoffset < 0 || yoffset < 0 || zoffset < 0 || !validImageSize(level, width, height) || depth < 0 || imageSize < 0)
{
return error(GL_INVALID_VALUE);
}
switch(format)
{
case GL_ETC1_RGB8_OES:
case GL_COMPRESSED_R11_EAC:
case GL_COMPRESSED_SIGNED_R11_EAC:
case GL_COMPRESSED_RG11_EAC:
case GL_COMPRESSED_SIGNED_RG11_EAC:
case GL_COMPRESSED_RGB8_ETC2:
case GL_COMPRESSED_SRGB8_ETC2:
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_RGBA8_ETC2_EAC:
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
break;
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
if(!S3TC_SUPPORT)
{
return error(GL_INVALID_ENUM);
}
break;
default:
return error(GL_INVALID_ENUM);
}
if(width == 0 || height == 0 || depth == 0 || data == NULL)
{
return;
}
es2::Context *context = es2::getContext();
if(context)
{
es2::Texture3D *texture = context->getTexture3D();
if(!texture)
{
return error(GL_INVALID_OPERATION);
}
texture->subImageCompressed(level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
}
} }
void GL_APIENTRY glGenQueries(GLsizei n, GLuint *ids) void GL_APIENTRY glGenQueries(GLsizei n, GLuint *ids)
{ {
TRACE("(GLsizei n = %d, GLuint* ids = 0x%0.8p)", n, ids);
if(n < 0)
{
return error(GL_INVALID_VALUE);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glDeleteQueries(GLsizei n, const GLuint *ids) void GL_APIENTRY glDeleteQueries(GLsizei n, const GLuint *ids)
{ {
TRACE("(GLsizei n = %d, GLuint* ids = 0x%0.8p)", n, ids);
if(n < 0)
{
return error(GL_INVALID_VALUE);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
GLboolean GL_APIENTRY glIsQuery(GLuint id) GLboolean GL_APIENTRY glIsQuery(GLuint id)
{ {
TRACE("(GLuint id = %d)", id);
UNIMPLEMENTED(); UNIMPLEMENTED();
return GL_FALSE; return GL_FALSE;
} }
void GL_APIENTRY glBeginQuery(GLenum target, GLuint id) void GL_APIENTRY glBeginQuery(GLenum target, GLuint id)
{ {
TRACE("(GLenum target = 0x%X, GLuint id = %d)", target, id);
if(!ValidateQueryTarget(target))
{
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glEndQuery(GLenum target) void GL_APIENTRY glEndQuery(GLenum target)
{ {
TRACE("(GLenum target = 0x%X)", target);
if(!ValidateQueryTarget(target))
{
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glGetQueryiv(GLenum target, GLenum pname, GLint *params) void GL_APIENTRY glGetQueryiv(GLenum target, GLenum pname, GLint *params)
{ {
TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
target, pname, params);
if(!ValidateQueryTarget(target) || (pname != GL_CURRENT_QUERY))
{
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) void GL_APIENTRY glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
{ {
TRACE("(GLuint id = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
id, pname, params);
switch(pname)
{
case GL_QUERY_RESULT:
case GL_QUERY_RESULT_AVAILABLE:
break;
default:
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
GLboolean GL_APIENTRY glUnmapBuffer(GLenum target) GLboolean GL_APIENTRY glUnmapBuffer(GLenum target)
{ {
TRACE("(GLenum target = 0x%X)", target);
UNIMPLEMENTED(); UNIMPLEMENTED();
return GL_FALSE; return GL_FALSE;
} }
void GL_APIENTRY glGetBufferPointerv(GLenum target, GLenum pname, void **params) void GL_APIENTRY glGetBufferPointerv(GLenum target, GLenum pname, void **params)
{ {
TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
target, pname, params);
if(!ValidateBufferTarget(target))
{
return error(GL_INVALID_ENUM);
}
if(pname != GL_BUFFER_MAP_POINTER)
{
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glDrawBuffers(GLsizei n, const GLenum *bufs) void GL_APIENTRY glDrawBuffers(GLsizei n, const GLenum *bufs)
{ {
TRACE("(GLsizei n = %d, const GLenum *bufs = 0x%0.8p)", n, bufs);
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
...@@ -126,58 +888,343 @@ void GL_APIENTRY glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean t ...@@ -126,58 +888,343 @@ void GL_APIENTRY glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean t
void GL_APIENTRY glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) void GL_APIENTRY glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
{ {
UNIMPLEMENTED(); TRACE("(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, "
"GLint dstX0 = %d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, "
"GLbitfield mask = 0x%X, GLenum filter = 0x%X)",
srcX0, srcY0, srcX1, srcX1, dstX0, dstY0, dstX1, dstY1, mask, filter);
switch(filter)
{
case GL_NEAREST:
case GL_LINEAR:
break;
default:
return error(GL_INVALID_ENUM);
}
if((mask & ~(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)) != 0)
{
return error(GL_INVALID_VALUE);
}
es2::Context *context = es2::getContext();
if(context)
{
if(context->getReadFramebufferName() == context->getDrawFramebufferName())
{
ERR("Blits with the same source and destination framebuffer are not supported by this implementation.");
return error(GL_INVALID_OPERATION);
}
context->blitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask);
}
} }
void GL_APIENTRY glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height) void GL_APIENTRY glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
{ {
UNIMPLEMENTED(); TRACE("(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d)",
target, samples, internalformat, width, height);
switch(target)
{
case GL_RENDERBUFFER:
break;
default:
return error(GL_INVALID_ENUM);
}
if(!es2::IsColorRenderable(internalformat) && !es2::IsDepthRenderable(internalformat) && !es2::IsStencilRenderable(internalformat))
{
return error(GL_INVALID_ENUM);
}
if(width < 0 || height < 0 || samples < 0)
{
return error(GL_INVALID_VALUE);
}
es2::Context *context = es2::getContext();
if(context)
{
if(width > es2::IMPLEMENTATION_MAX_RENDERBUFFER_SIZE ||
height > es2::IMPLEMENTATION_MAX_RENDERBUFFER_SIZE ||
samples > es2::IMPLEMENTATION_MAX_SAMPLES)
{
return error(GL_INVALID_VALUE);
}
GLuint handle = context->getRenderbufferName();
if(handle == 0)
{
return error(GL_INVALID_OPERATION);
}
switch(internalformat)
{
case GL_DEPTH_COMPONENT16:
case GL_DEPTH_COMPONENT24:
case GL_DEPTH_COMPONENT32F:
context->setRenderbufferStorage(new es2::Depthbuffer(width, height, samples));
break;
case GL_R8UI:
case GL_R8I:
case GL_R16UI:
case GL_R16I:
case GL_R32UI:
case GL_R32I:
case GL_RG8UI:
case GL_RG8I:
case GL_RG16UI:
case GL_RG16I:
case GL_RG32UI:
case GL_RG32I:
case GL_RGB8UI:
case GL_RGB8I:
case GL_RGB16UI:
case GL_RGB16I:
case GL_RGB32UI:
case GL_RGB32I:
case GL_RGBA8UI:
case GL_RGBA8I:
case GL_RGB10_A2UI:
case GL_RGBA16UI:
case GL_RGBA16I:
case GL_RGBA32UI:
case GL_RGBA32I:
if(samples > 0)
{
return error(GL_INVALID_OPERATION);
}
case GL_RGBA4:
case GL_RGB5_A1:
case GL_RGB565:
case GL_SRGB8_ALPHA8:
case GL_RGB10_A2:
case GL_R8:
case GL_RG8:
case GL_RGB8:
case GL_RGBA8:
context->setRenderbufferStorage(new es2::Colorbuffer(width, height, internalformat, samples));
break;
case GL_STENCIL_INDEX8:
context->setRenderbufferStorage(new es2::Stencilbuffer(width, height, samples));
break;
case GL_DEPTH24_STENCIL8:
case GL_DEPTH32F_STENCIL8:
context->setRenderbufferStorage(new es2::DepthStencilbuffer(width, height, samples));
break;
default:
return error(GL_INVALID_ENUM);
}
}
} }
void GL_APIENTRY glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) void GL_APIENTRY glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
{ {
TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %d, GLint level = %d, GLint layer = %d)",
target, attachment, texture, level, layer);
switch(target)
{
case GL_DRAW_FRAMEBUFFER:
case GL_READ_FRAMEBUFFER:
case GL_FRAMEBUFFER:
break;
default:
return error(GL_INVALID_ENUM);
}
switch(attachment)
{
case GL_COLOR_ATTACHMENT0:
case GL_COLOR_ATTACHMENT1:
case GL_COLOR_ATTACHMENT2:
case GL_COLOR_ATTACHMENT3:
case GL_COLOR_ATTACHMENT4:
case GL_COLOR_ATTACHMENT5:
case GL_COLOR_ATTACHMENT6:
case GL_COLOR_ATTACHMENT7:
case GL_COLOR_ATTACHMENT8:
case GL_COLOR_ATTACHMENT9:
case GL_COLOR_ATTACHMENT10:
case GL_COLOR_ATTACHMENT11:
case GL_COLOR_ATTACHMENT12:
case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15:
case GL_DEPTH_ATTACHMENT:
case GL_STENCIL_ATTACHMENT:
case GL_DEPTH_STENCIL_ATTACHMENT:
break;
default:
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void *GL_APIENTRY glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access) void *GL_APIENTRY glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
{ {
TRACE("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = %X)",
target, offset, length, access);
GLint bufferSize;
glGetBufferParameteriv(target, GL_BUFFER_SIZE, &bufferSize);
if((offset < 0) || (length<0) || ((offset + length) > bufferSize))
{
error(GL_INVALID_VALUE);
}
if((access & ~(GL_MAP_READ_BIT |
GL_MAP_WRITE_BIT |
GL_MAP_INVALIDATE_RANGE_BIT |
GL_MAP_INVALIDATE_BUFFER_BIT |
GL_MAP_FLUSH_EXPLICIT_BIT |
GL_MAP_UNSYNCHRONIZED_BIT)) != 0)
{
error(GL_INVALID_VALUE);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
return nullptr; return nullptr;
} }
void GL_APIENTRY glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length) void GL_APIENTRY glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
{ {
TRACE("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)",
target, offset, length);
if(!ValidateBufferTarget(target))
{
return error(GL_INVALID_ENUM);
}
if((offset < 0) || (length<0)) // FIXME: also check if offset + length exceeds the size of the mapping
{
error(GL_INVALID_VALUE);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glBindVertexArray(GLuint array) void GL_APIENTRY glBindVertexArray(GLuint array)
{ {
TRACE("(GLuint array = %d)", array);
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glDeleteVertexArrays(GLsizei n, const GLuint *arrays) void GL_APIENTRY glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
{ {
TRACE("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays);
if(n < 0)
{
return error(GL_INVALID_VALUE);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glGenVertexArrays(GLsizei n, GLuint *arrays) void GL_APIENTRY glGenVertexArrays(GLsizei n, GLuint *arrays)
{ {
TRACE("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays);
if(n < 0)
{
return error(GL_INVALID_VALUE);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
GLboolean GL_APIENTRY glIsVertexArray(GLuint array) GLboolean GL_APIENTRY glIsVertexArray(GLuint array)
{ {
TRACE("(GLuint array = %d)", array);
UNIMPLEMENTED(); UNIMPLEMENTED();
return GL_FALSE; return GL_FALSE;
} }
void GL_APIENTRY glGetIntegeri_v(GLenum target, GLuint index, GLint *data) void GL_APIENTRY glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
{ {
UNIMPLEMENTED(); TRACE("(GLenum target = 0x%X, GLuint index = %d, GLint* data = 0x%0.8p)",
target, index, data);
es2::Context *context = es2::getContext();
if(context)
{
if(!context->getTransformFeedbackiv(index, target, data) &&
!context->getIntegerv(target, data))
{
GLenum nativeType;
unsigned int numParams = 0;
if(!context->getQueryParameterInfo(target, &nativeType, &numParams))
return error(GL_INVALID_ENUM);
if(numParams == 0)
return; // it is known that target is valid, but there are no parameters to return
if(nativeType == GL_BOOL)
{
GLboolean *boolParams = NULL;
boolParams = new GLboolean[numParams];
context->getBooleanv(target, boolParams);
for(unsigned int i = 0; i < numParams; ++i)
{
if(boolParams[i] == GL_FALSE)
data[i] = 0;
else
data[i] = 1;
}
delete[] boolParams;
}
else if(nativeType == GL_FLOAT)
{
GLfloat *floatParams = NULL;
floatParams = new GLfloat[numParams];
context->getFloatv(target, floatParams);
for(unsigned int i = 0; i < numParams; ++i)
{
if(target == GL_DEPTH_RANGE || target == GL_COLOR_CLEAR_VALUE || target == GL_DEPTH_CLEAR_VALUE || target == GL_BLEND_COLOR)
{
data[i] = (GLint)(((GLfloat)(0xFFFFFFFF) * floatParams[i] - 1.0f) / 2.0f);
}
else
{
data[i] = (GLint)(floatParams[i] > 0.0f ? floor(floatParams[i] + 0.5) : ceil(floatParams[i] - 0.5));
}
}
delete[] floatParams;
}
}
}
} }
void GL_APIENTRY glBeginTransformFeedback(GLenum primitiveMode) void GL_APIENTRY glBeginTransformFeedback(GLenum primitiveMode)
{ {
TRACE("(GLenum primitiveMode = 0x%X)", primitiveMode);
switch(primitiveMode)
{
case GL_POINTS:
case GL_LINES:
case GL_TRIANGLES:
break;
default:
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
...@@ -188,11 +1235,35 @@ void GL_APIENTRY glEndTransformFeedback(void) ...@@ -188,11 +1235,35 @@ void GL_APIENTRY glEndTransformFeedback(void)
void GL_APIENTRY glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size) void GL_APIENTRY glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
{ {
TRACE("(GLenum target = 0x%X, GLuint index = %d, GLuint buffer = %d, GLintptr offset = %d, GLsizeiptr size = %d)",
target, index, buffer, offset, size);
switch(target)
{
case GL_TRANSFORM_FEEDBACK_BUFFER:
case GL_UNIFORM_BUFFER:
break;
default:
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void GL_APIENTRY glBindBufferBase(GLenum target, GLuint index, GLuint buffer) void GL_APIENTRY glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
{ {
TRACE("(GLenum target = 0x%X, GLuint index = %d, GLuint buffer = %d)",
target, index, buffer);
switch(target)
{
case GL_TRANSFORM_FEEDBACK_BUFFER:
case GL_UNIFORM_BUFFER:
break;
default:
return error(GL_INVALID_ENUM);
}
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
......
src/OpenGL/libGLESv2/utilities.cpp
...@@ -211,9 +211,19 @@ namespace es2 ...@@ -211,9 +211,19 @@ namespace es2
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
case GL_ETC1_RGB8_OES: case GL_ETC1_RGB8_OES:
case GL_COMPRESSED_R11_EAC:
case GL_COMPRESSED_SIGNED_R11_EAC:
case GL_COMPRESSED_RGB8_ETC2:
case GL_COMPRESSED_SRGB8_ETC2:
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
return 8 * (GLsizei)ceil((float)width / 4.0f) * (GLsizei)ceil((float)height / 4.0f); return 8 * (GLsizei)ceil((float)width / 4.0f) * (GLsizei)ceil((float)height / 4.0f);
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE: case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE: case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
case GL_COMPRESSED_RG11_EAC:
case GL_COMPRESSED_SIGNED_RG11_EAC:
case GL_COMPRESSED_RGBA8_ETC2_EAC:
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
return 16 * (GLsizei)ceil((float)width / 4.0f) * (GLsizei)ceil((float)height / 4.0f); return 16 * (GLsizei)ceil((float)width / 4.0f) * (GLsizei)ceil((float)height / 4.0f);
default: default:
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment