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/formatutils.h | 88 ++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 src/3rdparty/angle/src/libGLESv2/formatutils.h (limited to 'src/3rdparty/angle/src/libGLESv2/formatutils.h') diff --git a/src/3rdparty/angle/src/libGLESv2/formatutils.h b/src/3rdparty/angle/src/libGLESv2/formatutils.h new file mode 100644 index 0000000000..2f592798b8 --- /dev/null +++ b/src/3rdparty/angle/src/libGLESv2/formatutils.h @@ -0,0 +1,88 @@ +// +// Copyright (c) 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. +// + +// formatutils.h: Queries for GL image formats. + +#ifndef LIBGLESV2_FORMATUTILS_H_ +#define LIBGLESV2_FORMATUTILS_H_ + +#include "angle_gl.h" + +#include "libGLESv2/Caps.h" +#include "libGLESv2/angletypes.h" + +#include + +typedef void (*MipGenerationFunction)(size_t sourceWidth, size_t sourceHeight, size_t sourceDepth, + const uint8_t *sourceData, size_t sourceRowPitch, size_t sourceDepthPitch, + uint8_t *destData, size_t destRowPitch, size_t destDepthPitch); + +typedef void (*LoadImageFunction)(size_t width, size_t height, size_t depth, + const uint8_t *input, size_t inputRowPitch, size_t inputDepthPitch, + uint8_t *output, size_t outputRowPitch, size_t outputDepthPitch); + +typedef void (*InitializeTextureDataFunction)(size_t width, size_t height, size_t depth, + uint8_t *output, size_t outputRowPitch, size_t outputDepthPitch); + +typedef void (*ColorReadFunction)(const void *source, void *dest); +typedef void (*ColorWriteFunction)(const void *source, void *dest); +typedef void (*ColorCopyFunction)(const void *source, void *dest); + +typedef void (*VertexCopyFunction)(const void *input, size_t stride, size_t count, void *output); + +namespace gl +{ + +typedef std::set FormatSet; + +bool IsValidInternalFormat(GLenum internalFormat, const Extensions &extensions, GLuint clientVersion); +bool IsValidFormat(GLenum format, const Extensions &extensions, GLuint clientVersion); +bool IsValidType(GLenum type, const Extensions &extensions, GLuint clientVersion); + +bool IsValidFormatCombination(GLenum internalFormat, GLenum format, GLenum type, const Extensions &extensions, GLuint clientVersion); +bool IsValidCopyTexImageCombination(GLenum textureInternalFormat, GLenum frameBufferInternalFormat, GLuint readBufferHandle, GLuint clientVersion); + +bool IsRenderingSupported(GLenum internalFormat, const Extensions &extensions, GLuint clientVersion); +bool IsFilteringSupported(GLenum internalFormat, const Extensions &extensions, GLuint clientVersion); + +bool IsSizedInternalFormat(GLenum internalFormat); +GLenum GetSizedInternalFormat(GLenum format, GLenum type); + +GLuint GetPixelBytes(GLenum internalFormat); +GLuint GetAlphaBits(GLenum internalFormat); +GLuint GetRedBits(GLenum internalFormat); +GLuint GetGreenBits(GLenum internalFormat); +GLuint GetBlueBits(GLenum internalFormat); +GLuint GetLuminanceBits(GLenum internalFormat); +GLuint GetDepthBits(GLenum internalFormat); +GLuint GetStencilBits(GLenum internalFormat); + +GLuint GetTypeBytes(GLenum type); +bool IsSpecialInterpretationType(GLenum type); +bool IsFloatOrFixedComponentType(GLenum type); + +GLenum GetFormat(GLenum internalFormat); +GLenum GetType(GLenum internalFormat); + +GLenum GetComponentType(GLenum internalFormat); +GLuint GetComponentCount(GLenum internalFormat); +GLenum GetColorEncoding(GLenum internalFormat); + +GLuint GetRowPitch(GLenum internalFormat, GLenum type, GLsizei width, GLint alignment); +GLuint GetDepthPitch(GLenum internalFormat, GLenum type, GLsizei width, GLsizei height, GLint alignment); +GLuint GetBlockSize(GLenum internalFormat, GLenum type, GLsizei width, GLsizei height); + +bool IsFormatCompressed(GLenum internalFormat); +GLuint GetCompressedBlockWidth(GLenum internalFormat); +GLuint GetCompressedBlockHeight(GLenum internalFormat); + +const FormatSet &GetAllSizedInternalFormats(); + +ColorWriteFunction GetColorWriteFunction(GLenum format, GLenum type); + +} + +#endif // LIBGLESV2_FORMATUTILS_H_ -- cgit v1.2.3