Revert "Enable point sprites in StateManagerGL."

Speculative fix for failures on the AMD FYI bot.

This reverts commit 67e04be12d.

Change-Id: Ia57e3c800a6ff9e81e31bf5b37a95e97460ceda4
Reviewed-on: https://chromium-review.googlesource.com/277681
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
This commit is contained in:
Geoff Lang 2015-06-15 21:25:28 +00:00
Родитель 588e7ed2f8
Коммит 464a6b8bb7
5 изменённых файлов: 4 добавлений и 27 удалений

Просмотреть файл

@ -773,12 +773,12 @@ void FunctionsGL::initialize()
{
// Grab the version number
AssignGLEntryPoint(loadProcAddress("glGetString"), &getString);
AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
GetGLVersion(getString, &version, &standard);
// Grab the GL extensions
if (isAtLeastGL(gl::Version(3, 0)))
{
AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
AssignGLEntryPoint(loadProcAddress("glGetStringi"), &getStringi);
extensions = GetIndexedExtensions(getIntegerv, getStringi);
}
@ -788,16 +788,6 @@ void FunctionsGL::initialize()
angle::SplitStringAlongWhitespace(std::string(exts), &extensions);
}
// Check the context profile
if (isAtLeastGL(gl::Version(3, 2)))
{
getIntegerv(GL_CONTEXT_PROFILE_MASK, &profile);
}
else
{
profile = 0;
}
// 1.0
if (isAtLeastGL(gl::Version(1, 0)))
{
@ -821,6 +811,8 @@ void FunctionsGL::initialize()
AssignGLEntryPoint(loadProcAddress("glGetDoublev"), &getDoublev);
AssignGLEntryPoint(loadProcAddress("glGetError"), &getError);
AssignGLEntryPoint(loadProcAddress("glGetFloatv"), &getFloatv);
AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
AssignGLEntryPoint(loadProcAddress("glGetString"), &getString);
AssignGLEntryPoint(loadProcAddress("glGetTexImage"), &getTexImage);
AssignGLEntryPoint(loadProcAddress("glGetTexLevelParameterfv"), &getTexLevelParameterfv);
AssignGLEntryPoint(loadProcAddress("glGetTexLevelParameteriv"), &getTexLevelParameteriv);

Просмотреть файл

@ -34,7 +34,6 @@ class FunctionsGL
// Version information
gl::Version version;
StandardGL standard;
GLint profile;
bool isAtLeastGL(const gl::Version &glVersion) const;
bool isAtLeastGLES(const gl::Version &glesVersion) const;

Просмотреть файл

@ -92,19 +92,6 @@ StateManagerGL::StateManagerGL(const FunctionsGL *functions, const gl::Caps &ren
mFramebuffers[GL_READ_FRAMEBUFFER] = 0;
mFramebuffers[GL_DRAW_FRAMEBUFFER] = 0;
// Initialize point sprite state for desktop GL
if (mFunctions->standard == STANDARD_GL_DESKTOP)
{
mFunctions->enable(GL_PROGRAM_POINT_SIZE);
// GL_POINT_SPRITE was deprecated in the core profile. Point rasterization is always performed
// as though POINT_SPRITE were enabled.
if (mFunctions->profile != GL_CONTEXT_CORE_PROFILE_BIT)
{
mFunctions->enable(GL_POINT_SPRITE);
}
}
}
void StateManagerGL::deleteProgram(GLuint program)

Просмотреть файл

@ -429,7 +429,6 @@
#define GL_MAX_VERTEX_ATTRIBS 0x8869
#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
#define GL_POINT_SPRITE 0x8861
#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
#define GL_SAMPLER_1D 0x8B5D
#define GL_SAMPLER_1D_SHADOW 0x8B61

Просмотреть файл

@ -429,4 +429,4 @@ TEST_P(PointSpritesTest, PointSizeDeclaredButUnused)
// We test on D3D11 9_3 because the existing D3D11 PointSprite implementation
// uses Geometry Shaders which are not supported for 9_3.
// D3D9 and D3D11 are also tested to ensure no regressions.
ANGLE_INSTANTIATE_TEST(PointSpritesTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES2_OPENGL(), ES3_OPENGL());
ANGLE_INSTANTIATE_TEST(PointSpritesTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3());