diff options
author | Andrew Knight <andrew.knight@intopalo.com> | 2015-04-08 17:04:36 +0300 |
---|---|---|
committer | Andrew Knight <qt@panimo.net> | 2015-04-09 10:31:12 +0000 |
commit | a218a252c4200cfe7048de81a46f7e48349084d5 (patch) | |
tree | c1a82865d97e610cd0abb3a1360408363b38205b /src/3rdparty/angle/src/libGLESv2/Shader.cpp | |
parent | 331ddacfca90c91c5b44484bf3c78e2aa5b85947 (diff) |
Upgrade ANGLE to 2.1~99f075dade7c
This aligns with Chromium branch 2356.
This version brings more complete OpenGL ES 3 support as well as various
bug fixes and performance improvements.
The following changes were made to earlier patches:
-0000-General-fixes-for-ANGLE-2.1
Removed. All changes are now handled elsewhere.
+0001-ANGLE-Improve-Windows-Phone-support
Consolidated remaining parts from 0009/0010.
+0002-ANGLE-Fix-compilation-with-MinGW
Remaining issues from patch 0016.
+0003-ANGLE-Fix-compilation-with-MSVC2010
Remaining issues from patch 0015.
+0004-ANGLE-Dynamically-load-D3D-compiler-from-list
Renamed from patch 0008.
+0005-ANGLE-Add-support-for-querying-platform-device
Renamed from patch 0013.
-0004-Make-it-possible-to-link-ANGLE-statically-for-single
Removed. Fixed by adding defines to project files.
-0008-ANGLE-Dynamically-load-D3D-compiler-from-a-list-or-t
Renamed to patch 0005.
-0009-ANGLE-Support-WinRT
Removed. Mostly fixed upstream; remaining parts in patch 0001.
-0010-ANGLE-Enable-D3D11-for-feature-level-9-cards
Removed. Mostly fixed upstream; remaining parts in patch 0001.
-0012-ANGLE-fix-semantic-index-lookup
Removed. Fixed upstream.
-0013-ANGLE-Add-support-for-querying-platform-device
Renamed to patch 0005.
-0014-Let-ANGLE-use-multithreaded-devices-if-necessary
Removed. No longer needed.
-0015-ANGLE-Fix-angle-d3d11-on-MSVC2010
Moved remaining parts to patch 0003.
-0016-ANGLE-Fix-compilation-with-MinGW-D3D11
Moved remaining parts to patch 0002.
-0017-ANGLE-Fix-compilation-with-D3D9
Removed. Fixed upstream.
-0018-ANGLE-Fix-releasing-textures-after-we-kill-D3D11
Removed. Fixed upstream.
-0019-ANGLE-Fix-handling-of-shader-source-with-fixed-lengt
Removed. Fixed upstream.
-0020-ANGLE-Do-not-use-std-strlen
Removed. Fixed upstream.
-0020-ANGLE-Fix-compilation-with-MSVC2013-Update4
Removed. Fixed upstream.
[ChangeLog][Third-party libraries] ANGLE was updated to Chromium branch
2356 (2.1~99f075dade7c).
Change-Id: I32ccbfe95e10986bd94be7191dfd53445ea09158
Task-number: QTBUG-44815
Task-number: QTBUG-37660
Task-number: QTBUG-44694
Task-number: QTBUG-42443
Reviewed-by: Andrew Knight <qt@panimo.net>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/Shader.cpp')
-rw-r--r-- | src/3rdparty/angle/src/libGLESv2/Shader.cpp | 219 |
1 files changed, 0 insertions, 219 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/Shader.cpp b/src/3rdparty/angle/src/libGLESv2/Shader.cpp deleted file mode 100644 index 024ef8fb7c..0000000000 --- a/src/3rdparty/angle/src/libGLESv2/Shader.cpp +++ /dev/null @@ -1,219 +0,0 @@ -// -// Copyright (c) 2002-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. -// - -// Shader.cpp: Implements the gl::Shader class and its derived classes -// VertexShader and FragmentShader. Implements GL shader objects and related -// functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section 3.8 page 84. - -#include "libGLESv2/Shader.h" -#include "libGLESv2/renderer/Renderer.h" -#include "libGLESv2/renderer/ShaderImpl.h" -#include "libGLESv2/Constants.h" -#include "libGLESv2/ResourceManager.h" - -#include "common/utilities.h" - -#include "GLSLANG/ShaderLang.h" - -#include <sstream> - -namespace gl -{ - -Shader::Shader(ResourceManager *manager, rx::ShaderImpl *impl, GLenum type, GLuint handle) - : mShader(impl), - mType(type), - mHandle(handle), - mResourceManager(manager), - mRefCount(0), - mDeleteStatus(false), - mCompiled(false) -{ - ASSERT(impl); -} - -Shader::~Shader() -{ - SafeDelete(mShader); -} - -GLuint Shader::getHandle() const -{ - return mHandle; -} - -void Shader::setSource(GLsizei count, const char *const *string, const GLint *length) -{ - std::ostringstream stream; - - for (int i = 0; i < count; i++) - { - if (length == nullptr || length[i] < 0) - { - stream.write(string[i], strlen(string[i])); - } - else - { - stream.write(string[i], length[i]); - } - } - - mSource = stream.str(); -} - -int Shader::getInfoLogLength() const -{ - return mShader->getInfoLog().empty() ? 0 : (mShader->getInfoLog().length() + 1); -} - -void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) const -{ - int index = 0; - - if (bufSize > 0) - { - index = std::min(bufSize - 1, static_cast<GLsizei>(mShader->getInfoLog().length())); - memcpy(infoLog, mShader->getInfoLog().c_str(), index); - - infoLog[index] = '\0'; - } - - if (length) - { - *length = index; - } -} - -int Shader::getSourceLength() const -{ - return mSource.empty() ? 0 : (mSource.length() + 1); -} - -int Shader::getTranslatedSourceLength() const -{ - return mShader->getTranslatedSource().empty() ? 0 : (mShader->getTranslatedSource().length() + 1); -} - -void Shader::getSourceImpl(const std::string &source, GLsizei bufSize, GLsizei *length, char *buffer) -{ - int index = 0; - - if (bufSize > 0) - { - index = std::min(bufSize - 1, static_cast<GLsizei>(source.length())); - memcpy(buffer, source.c_str(), index); - - buffer[index] = '\0'; - } - - if (length) - { - *length = index; - } -} - -void Shader::getSource(GLsizei bufSize, GLsizei *length, char *buffer) const -{ - getSourceImpl(mSource, bufSize, length, buffer); -} - -void Shader::getTranslatedSource(GLsizei bufSize, GLsizei *length, char *buffer) const -{ - getSourceImpl(mShader->getTranslatedSource(), bufSize, length, buffer); -} - -void Shader::getTranslatedSourceWithDebugInfo(GLsizei bufSize, GLsizei *length, char *buffer) const -{ - std::string debugInfo(mShader->getDebugInfo()); - getSourceImpl(debugInfo, bufSize, length, buffer); -} - -void Shader::compile(const gl::Data &data) -{ - mCompiled = mShader->compile(data, mSource); -} - -void Shader::addRef() -{ - mRefCount++; -} - -void Shader::release() -{ - mRefCount--; - - if (mRefCount == 0 && mDeleteStatus) - { - mResourceManager->deleteShader(mHandle); - } -} - -unsigned int Shader::getRefCount() const -{ - return mRefCount; -} - -bool Shader::isFlaggedForDeletion() const -{ - return mDeleteStatus; -} - -void Shader::flagForDeletion() -{ - mDeleteStatus = true; -} - -const std::vector<gl::PackedVarying> &Shader::getVaryings() const -{ - return mShader->getVaryings(); -} - -const std::vector<sh::Uniform> &Shader::getUniforms() const -{ - return mShader->getUniforms(); -} - -const std::vector<sh::InterfaceBlock> &Shader::getInterfaceBlocks() const -{ - return mShader->getInterfaceBlocks(); -} - -const std::vector<sh::Attribute> &Shader::getActiveAttributes() const -{ - return mShader->getActiveAttributes(); -} - -const std::vector<sh::Attribute> &Shader::getActiveOutputVariables() const -{ - return mShader->getActiveOutputVariables(); -} - -std::vector<gl::PackedVarying> &Shader::getVaryings() -{ - return mShader->getVaryings(); -} - -std::vector<sh::Uniform> &Shader::getUniforms() -{ - return mShader->getUniforms(); -} - -std::vector<sh::InterfaceBlock> &Shader::getInterfaceBlocks() -{ - return mShader->getInterfaceBlocks(); -} - -std::vector<sh::Attribute> &Shader::getActiveAttributes() -{ - return mShader->getActiveAttributes(); -} - -std::vector<sh::Attribute> &Shader::getActiveOutputVariables() -{ - return mShader->getActiveOutputVariables(); -} - -} |