Skip to content

A
angle
Commit 55856b16 by Jamie Madill
Options

Clean up state query methods.

Consolidate a lot of the code duplication in GetIntegerv, GetFloatv, GetBooleanv and GetInteger64v. BUG=angle:540 Change-Id: I7b4a5803ea76e5eeb0ebf25c5caadec4c647b485 Reviewed-on: https://chromium-review.googlesource.com/180971 Commit-Queue: Nicolas Capens <nicolascapens@chromium.org> Reviewed-by: 's avatarNicolas Capens <nicolascapens@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 3cd50f7e
Showing with 196 additions and 211 deletions
projects/src/libGLESv2.vcxproj
......@@ -113,8 +113,8 @@
<ItemGroup>
<None Include="..\..\src\angle.gyp"/>
<None Include="..\..\src\libGLESv2\libGLESv2.def"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough2D11.hlsl"/>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough3D11.hlsl"/>
......@@ -126,9 +126,11 @@
<ItemGroup>
<ClInclude Include="..\..\src\libGLESv2\resource.h"/>
<ClInclude Include="..\..\src\libGLESv2\Buffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\Shader.h"/>
<ClInclude Include="..\..\src\libGLESv2\BinaryStream.h"/>
<ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h"/>
<ClInclude Include="..\..\src\libGLESv2\queryconversions.h"/>
<ClInclude Include="..\..\src\libGLESv2\validationES3.h"/>
<ClInclude Include="..\..\src\libGLESv2\Program.h"/>
<ClInclude Include="..\..\src\libGLESv2\Sampler.h"/>
......@@ -146,7 +148,6 @@
<ClInclude Include="..\..\src\libGLESv2\main.h"/>
<ClInclude Include="..\..\src\libGLESv2\Framebuffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\constants.h"/>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\VertexArray.h"/>
<ClInclude Include="..\..\src\libGLESv2\formatutils.h"/>
<ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h"/>
......@@ -282,6 +283,7 @@
<ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\validationES2.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\precompiled.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\HandleAllocator.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\formatutils.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\RenderbufferProxySet.cpp"/>
......@@ -289,7 +291,6 @@
<ClCompile Include="..\..\src\libGLESv2\Fence.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\validationES.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Sampler.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Query.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Buffer.cpp"/>
......@@ -302,11 +303,12 @@
<ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Texture.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Sampler.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\angletypes.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\copyimage.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexDataManager.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexDataManager.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexBuffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp"/>
......
projects/src/libGLESv2.vcxproj.filters
......@@ -46,6 +46,9 @@
<ClInclude Include="..\..\src\libGLESv2\Buffer.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Shader.h">
<Filter>libGLESv2</Filter>
</ClInclude>
......@@ -61,12 +64,18 @@
<ClCompile Include="..\..\src\libGLESv2\precompiled.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\queryconversions.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\validationES3.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Program.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\Sampler.h">
<Filter>libGLESv2</Filter>
</ClInclude>
......@@ -121,9 +130,6 @@
<ClCompile Include="..\..\src\libGLESv2\validationES.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\Sampler.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
......@@ -178,9 +184,9 @@
<ClInclude Include="..\..\src\libGLESv2\constants.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h">
<ClCompile Include="..\..\src\libGLESv2\Sampler.cpp">
<Filter>libGLESv2</Filter>
</ClInclude>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\VertexArray.h">
<Filter>libGLESv2</Filter>
</ClInclude>
......@@ -208,15 +214,15 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\Renderer.h">
<Filter>libGLESv2\renderer</Filter>
</ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp">
<Filter>libGLESv2\renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\IndexDataManager.cpp">
<Filter>libGLESv2\renderer</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h">
<Filter>libGLESv2\renderer</Filter>
</ClInclude>
<ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp">
<Filter>libGLESv2\renderer</Filter>
</ClCompile>
<ClInclude Include="..\..\src\libGLESv2\renderer\TextureStorage.h">
<Filter>libGLESv2\renderer</Filter>
</ClInclude>
......@@ -403,10 +409,10 @@
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp">
<Filter>libGLESv2\renderer\d3d11</Filter>
</ClCompile>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat">
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl">
<Filter>libGLESv2\renderer\d3d11\shaders</Filter>
</None>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl">
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat">
<Filter>libGLESv2\renderer\d3d11\shaders</Filter>
</None>
<None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl">
......
src/libGLESv2/libGLESv2.cpp
......@@ -26,6 +26,7 @@
#include "libGLESv2/validationES.h"
#include "libGLESv2/validationES2.h"
#include "libGLESv2/validationES3.h"
#include "libGLESv2/queryconversions.h"
gl::Texture *GetTargetTexture(gl::Context *context, GLenum target)
{
......@@ -2578,56 +2579,9 @@ void __stdcall glGetBooleanv(GLenum pname, GLboolean* params)
{
context->getBooleanv(pname, params);
}
else if (nativeType == GL_FLOAT)
{
GLfloat *floatParams = NULL;
floatParams = new GLfloat[numParams];
context->getFloatv(pname, floatParams);
for (unsigned int i = 0; i < numParams; ++i)
{
if (floatParams[i] == 0.0f)
params[i] = GL_FALSE;
else
params[i] = GL_TRUE;
}
delete [] floatParams;
}
else if (nativeType == GL_INT)
{
GLint *intParams = NULL;
intParams = new GLint[numParams];
context->getIntegerv(pname, intParams);
for (unsigned int i = 0; i < numParams; ++i)
{
if (intParams[i] == 0)
params[i] = GL_FALSE;
else
params[i] = GL_TRUE;
}
delete [] intParams;
}
else if (nativeType == GL_INT_64_ANGLEX)
else
{
GLint64 *int64Params = NULL;
int64Params = new GLint64[numParams];
context->getInteger64v(pname, int64Params);
for (unsigned int i = 0; i < numParams; ++i)
{
if (int64Params[i] == 0)
params[i] = GL_FALSE;
else
params[i] = GL_TRUE;
}
delete [] int64Params;
CastStateValues(context, nativeType, pname, numParams, params);
}
}
}
......@@ -2762,50 +2716,9 @@ void __stdcall glGetFloatv(GLenum pname, GLfloat* params)
{
context->getFloatv(pname, params);
}
else if (nativeType == GL_BOOL)
{
GLboolean *boolParams = NULL;
boolParams = new GLboolean[numParams];
context->getBooleanv(pname, boolParams);
for (unsigned int i = 0; i < numParams; ++i)
{
if (boolParams[i] == GL_FALSE)
params[i] = 0.0f;
else
params[i] = 1.0f;
}
delete [] boolParams;
}
else if (nativeType == GL_INT)
{
GLint *intParams = NULL;
intParams = new GLint[numParams];
context->getIntegerv(pname, intParams);
for (unsigned int i = 0; i < numParams; ++i)
{
params[i] = static_cast<GLfloat>(intParams[i]);
}
delete [] intParams;
}
else if (nativeType == GL_INT_64_ANGLEX)
else
{
GLint64 *int64Params = NULL;
int64Params = new GLint64[numParams];
context->getInteger64v(pname, int64Params);
for (unsigned int i = 0; i < numParams; ++i)
{
params[i] = static_cast<GLfloat>(int64Params[i]);
}
delete [] int64Params;
CastStateValues(context, nativeType, pname, numParams, params);
}
}
}
......@@ -3163,61 +3076,9 @@ void __stdcall glGetIntegerv(GLenum pname, GLint* params)
{
context->getIntegerv(pname, params);
}
else if (nativeType == GL_BOOL)
{
GLboolean *boolParams = NULL;
boolParams = new GLboolean[numParams];
context->getBooleanv(pname, boolParams);
for (unsigned int i = 0; i < numParams; ++i)
{
if (boolParams[i] == GL_FALSE)
params[i] = 0;
else
params[i] = 1;
}
delete [] boolParams;
}
else if (nativeType == GL_FLOAT)
{
GLfloat *floatParams = NULL;
floatParams = new GLfloat[numParams];
context->getFloatv(pname, floatParams);
for (unsigned int i = 0; i < numParams; ++i)
{
// RGBA color values and DepthRangeF values are converted to integer using Equation 2.4 from Table 4.5
if (pname == GL_DEPTH_RANGE || pname == GL_COLOR_CLEAR_VALUE || pname == GL_DEPTH_CLEAR_VALUE || pname == GL_BLEND_COLOR)
{
params[i] = static_cast<GLint>((static_cast<GLfloat>(0xFFFFFFFF) * floatParams[i] - 1.0f) / 2.0f);
}
else
{
params[i] = gl::iround<GLint>(floatParams[i]);
}
}
delete [] floatParams;
}
else if (nativeType == GL_INT_64_ANGLEX)
else
{
GLint64 minIntValue = static_cast<GLint64>(std::numeric_limits<int>::min());
GLint64 maxIntValue = static_cast<GLint64>(std::numeric_limits<int>::max());
GLint64 *int64Params = NULL;
int64Params = new GLint64[numParams];
context->getInteger64v(pname, int64Params);
for (unsigned int i = 0; i < numParams; ++i)
{
GLint64 clampedValue = std::max(std::min(int64Params[i], maxIntValue), minIntValue);
params[i] = static_cast<GLint>(clampedValue);
}
delete [] int64Params;
CastStateValues(context, nativeType, pname, numParams, params);
}
}
}
......@@ -9259,58 +9120,9 @@ void __stdcall glGetInteger64v(GLenum pname, GLint64* params)
{
context->getInteger64v(pname, params);
}
else if (nativeType == GL_BOOL)
{
GLboolean *boolParams = NULL;
boolParams = new GLboolean[numParams];
context->getBooleanv(pname, boolParams);
for (unsigned int i = 0; i < numParams; ++i)
{
if (boolParams[i] == GL_FALSE)
params[i] = 0;
else
params[i] = 1;
}
delete [] boolParams;
}
else if (nativeType == GL_INT)
{
GLint *intParams = NULL;
intParams = new GLint[numParams];
context->getIntegerv(pname, intParams);
for (unsigned int i = 0; i < numParams; ++i)
{
params[i] = static_cast<GLint64>(intParams[i]);
}
delete [] intParams;
}
else if (nativeType == GL_FLOAT)
else
{
GLfloat *floatParams = NULL;
floatParams = new GLfloat[numParams];
context->getFloatv(pname, floatParams);
for (unsigned int i = 0; i < numParams; ++i)
{
// RGBA color values and DepthRangeF values are converted to integer using Equation 2.4 from Table 4.5
if (pname == GL_DEPTH_RANGE || pname == GL_COLOR_CLEAR_VALUE || pname == GL_DEPTH_CLEAR_VALUE || pname == GL_BLEND_COLOR)
{
params[i] = static_cast<GLint64>((static_cast<GLfloat>(0xFFFFFFFF) * floatParams[i] - 1.0f) / 2.0f);
}
else
{
params[i] = gl::iround<GLint64>(floatParams[i]);
}
}
delete [] floatParams;
CastStateValues(context, nativeType, pname, numParams, params);
}
}
}
......
src/libGLESv2/queryconversions.cpp 0 → 100644
#include "precompiled.h"
//
// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// queryconversions.cpp: Implementation of state query cast conversions
#include "libGLESv2/Context.h"
#include "common/utilities.h"
namespace gl
{
// Helper class for converting a GL type to a GLenum:
// We can't use CastStateValueEnum generally, because of GLboolean + GLubyte overlap.
// We restrict our use to CastStateValue, where it eliminates duplicate parameters.
template <typename GLType>
struct CastStateValueEnum { static GLenum mEnumForType; };
template <> GLenum CastStateValueEnum<GLint>::mEnumForType = GL_INT;
template <> GLenum CastStateValueEnum<GLuint>::mEnumForType = GL_UNSIGNED_INT;
template <> GLenum CastStateValueEnum<GLboolean>::mEnumForType = GL_BOOL;
template <> GLenum CastStateValueEnum<GLint64>::mEnumForType = GL_INT_64_ANGLEX;
template <> GLenum CastStateValueEnum<GLfloat>::mEnumForType = GL_FLOAT;
template <typename QueryT, typename NativeT>
QueryT CastStateValueToInt(GLenum pname, NativeT value)
{
GLenum queryType = CastStateValueEnum<QueryT>::mEnumForType;
GLenum nativeType = CastStateValueEnum<NativeT>::mEnumForType;
if (nativeType == GL_FLOAT)
{
// RGBA color values and DepthRangeF values are converted to integer using Equation 2.4 from Table 4.5
if (pname == GL_DEPTH_RANGE || pname == GL_COLOR_CLEAR_VALUE || pname == GL_DEPTH_CLEAR_VALUE || pname == GL_BLEND_COLOR)
{
return static_cast<QueryT>((static_cast<GLfloat>(0xFFFFFFFF) * value - 1.0f) / 2.0f);
}
else
{
return gl::iround<QueryT>(value);
}
}
// Clamp 64-bit int values when casting to int
if (nativeType == GL_INT_64_ANGLEX && queryType == GL_INT)
{
GLint64 minIntValue = static_cast<GLint64>(std::numeric_limits<GLint>::min());
GLint64 maxIntValue = static_cast<GLint64>(std::numeric_limits<GLint>::max());
GLint64 clampedValue = std::max(std::min(static_cast<GLint64>(value), maxIntValue), minIntValue);
return static_cast<QueryT>(clampedValue);
}
return static_cast<QueryT>(value);
}
template <typename QueryT, typename NativeT>
QueryT CastStateValue(GLenum pname, NativeT value)
{
GLenum queryType = CastStateValueEnum<QueryT>::mEnumForType;
switch (queryType)
{
case GL_INT: return CastStateValueToInt<QueryT, NativeT>(pname, value);
case GL_INT_64_ANGLEX: return CastStateValueToInt<QueryT, NativeT>(pname, value);
case GL_FLOAT: return static_cast<QueryT>(value);
case GL_BOOL: return (value == static_cast<NativeT>(0) ? GL_FALSE : GL_TRUE);
default: UNREACHABLE(); return 0;
}
}
template <typename QueryT>
void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
unsigned int numParams, QueryT *outParams)
{
if (nativeType == GL_INT)
{
GLint *intParams = NULL;
intParams = new GLint[numParams];
context->getIntegerv(pname, intParams);
for (unsigned int i = 0; i < numParams; ++i)
{
outParams[i] = CastStateValue<QueryT>(pname, intParams[i]);
}
delete [] intParams;
}
else if (nativeType == GL_BOOL)
{
GLboolean *boolParams = NULL;
boolParams = new GLboolean[numParams];
context->getBooleanv(pname, boolParams);
for (unsigned int i = 0; i < numParams; ++i)
{
outParams[i] = (boolParams[i] == GL_FALSE ? static_cast<QueryT>(0) : static_cast<QueryT>(1));
}
delete [] boolParams;
}
else if (nativeType == GL_FLOAT)
{
GLfloat *floatParams = NULL;
floatParams = new GLfloat[numParams];
context->getFloatv(pname, floatParams);
for (unsigned int i = 0; i < numParams; ++i)
{
outParams[i] = CastStateValue<QueryT>(pname, floatParams[i]);
}
delete [] floatParams;
}
else if (nativeType == GL_INT_64_ANGLEX)
{
GLint64 *int64Params = NULL;
int64Params = new GLint64[numParams];
context->getInteger64v(pname, int64Params);
for (unsigned int i = 0; i < numParams; ++i)
{
outParams[i] = CastStateValue<QueryT>(pname, int64Params[i]);
}
delete [] int64Params;
}
else UNREACHABLE();
}
// Explicit template instantiation (how we export template functions in different files)
// The calls below will make CastStateValues successfully link with the GL state query types
// The GL state query API types are: bool, int, uint, float, int64
template void CastStateValues<GLboolean>(Context *, GLenum, GLenum, unsigned int, GLboolean *);
template void CastStateValues<GLint>(Context *, GLenum, GLenum, unsigned int, GLint *);
template void CastStateValues<GLuint>(Context *, GLenum, GLenum, unsigned int, GLuint *);
template void CastStateValues<GLfloat>(Context *, GLenum, GLenum, unsigned int, GLfloat *);
template void CastStateValues<GLint64>(Context *, GLenum, GLenum, unsigned int, GLint64 *);
}
src/libGLESv2/queryconversions.h 0 → 100644
//
// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// queryconversions.h: Declaration of state query cast conversions
namespace gl
{
// The GL state query API types are: bool, int, uint, float, int64
template <typename QueryT>
void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
unsigned int numParams, QueryT *outParams);
}
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