From a6a12d8c0fc918972c15268f749ecc7c90b95d6c Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Tue, 5 Aug 2014 12:59:44 +0300 Subject: ANGLE: upgrade to 2.1~07d49ef5350a This version of ANGLE provides partial ES3 support, numerous bug fixes, and several potentially useful vendor extensions. All patches have been rebased. The following changes are noted: 0000-General-fixes-for-ANGLE-2.1.patch contains compile fixes for the new ANGLE 0004-Make-it-possible-to-link-ANGLE-statically-for-single.patch has incorporated patch 0015. 0007-Make-DX9-DX11-mutually-exclusive.patch has been removed as it was fixed upstream. 0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch has been moved up to fill the patch number gap. 0010-ANGLE-Enable-D3D11-for-feature-level-9-cards.patch now contains patch 0014 and 0017. 0013-ANGLE-Allow-for-universal-program-binaries.patch has been removed as it is no longer relevant. 0014-ANGLE-D3D11-Fix-internal-index-buffer-for-level-9-ha.patch has been merged with patch 0010. 0015-ANGLE-Don-t-export-DLLMain-functions-for-static-buil.patch has been merged with patch 0004. 0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch has been removed and will be replaced by a follow-up patch using a different technique. 0017-ANGLE-D3D11-Don-t-use-mipmaps-in-level-9-textures.patch has been merged with patch 0010. 0018-ANGLE-WinRT-Create-swap-chain-using-physical-resolut.patch has been removed and will be replaced by a follow-up patch extending the EGL_ANGLE_window_fixed_size extension. 0019-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch is now patch 0007. [ChangeLog][Third-party libraries] ANGLE has been upgraded to version 2.1, bringing partial support for OpenGL ES3 over Direct3D 11, numerous bug fixes, and several new vendor extensions. Change-Id: I6d95ce1480462d67228d83c1e5c74a1706b5b21c Reviewed-by: Friedemann Kleint --- src/3rdparty/angle/src/libGLESv2/utilities.h | 67 ---------------------------- 1 file changed, 67 deletions(-) delete mode 100644 src/3rdparty/angle/src/libGLESv2/utilities.h (limited to 'src/3rdparty/angle/src/libGLESv2/utilities.h') diff --git a/src/3rdparty/angle/src/libGLESv2/utilities.h b/src/3rdparty/angle/src/libGLESv2/utilities.h deleted file mode 100644 index ed663ebca2..0000000000 --- a/src/3rdparty/angle/src/libGLESv2/utilities.h +++ /dev/null @@ -1,67 +0,0 @@ -// -// Copyright (c) 2002-2013 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. -// - -// utilities.h: Conversion functions and other utility routines. - -#ifndef LIBGLESV2_UTILITIES_H -#define LIBGLESV2_UTILITIES_H - -#define GL_APICALL -#include -#include - -#include - -namespace gl -{ - -struct Color; - -int UniformComponentCount(GLenum type); -GLenum UniformComponentType(GLenum type); -size_t UniformInternalSize(GLenum type); -size_t UniformExternalSize(GLenum type); -int VariableRowCount(GLenum type); -int VariableColumnCount(GLenum type); - -int AllocateFirstFreeBits(unsigned int *bits, unsigned int allocationSize, unsigned int bitsSize); - -void MakeValidSize(bool isImage, bool isCompressed, GLsizei *requestWidth, GLsizei *requestHeight, int *levelOffset); -int ComputePixelSize(GLint internalformat); -GLsizei ComputePitch(GLsizei width, GLint internalformat, GLint alignment); -GLsizei ComputeCompressedPitch(GLsizei width, GLenum format); -GLsizei ComputeCompressedSize(GLsizei width, GLsizei height, GLenum format); -GLsizei ComputeTypeSize(GLenum type); -bool IsCompressed(GLenum format); -bool IsDepthTexture(GLenum format); -bool IsStencilTexture(GLenum format); -bool IsCubemapTextureTarget(GLenum target); -bool IsInternalTextureTarget(GLenum target); -GLint ConvertSizedInternalFormat(GLenum format, GLenum type); -GLenum ExtractFormat(GLenum internalformat); -GLenum ExtractType(GLenum internalformat); - -bool IsColorRenderable(GLenum internalformat); -bool IsDepthRenderable(GLenum internalformat); -bool IsStencilRenderable(GLenum internalformat); - -bool IsFloat32Format(GLint internalformat); -bool IsFloat16Format(GLint internalformat); - -GLuint GetAlphaSize(GLenum colorFormat); -GLuint GetRedSize(GLenum colorFormat); -GLuint GetGreenSize(GLenum colorFormat); -GLuint GetBlueSize(GLenum colorFormat); -GLuint GetDepthSize(GLenum depthFormat); -GLuint GetStencilSize(GLenum stencilFormat); -bool IsTriangleMode(GLenum drawMode); - -} - -std::string getTempPath(); -void writeFile(const char* path, const void* data, size_t size); - -#endif // LIBGLESV2_UTILITIES_H -- cgit v1.2.3