diff options
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/utilities.h')
-rw-r--r-- | src/3rdparty/angle/src/libGLESv2/utilities.h | 75 |
1 files changed, 10 insertions, 65 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/utilities.h b/src/3rdparty/angle/src/libGLESv2/utilities.h index 29ad207313..7a10767086 100644 --- a/src/3rdparty/angle/src/libGLESv2/utilities.h +++ b/src/3rdparty/angle/src/libGLESv2/utilities.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved. +// 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. // @@ -12,20 +12,15 @@ #define GL_APICALL #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#include <d3d9.h> #include <string> -const D3DFORMAT D3DFMT_INTZ = ((D3DFORMAT)(MAKEFOURCC('I','N','T','Z'))); -const D3DFORMAT D3DFMT_NULL = ((D3DFORMAT)(MAKEFOURCC('N','U','L','L'))); - namespace gl { struct Color; -int UniformExternalComponentCount(GLenum type); -int UniformInternalComponentCount(GLenum type); +int UniformComponentCount(GLenum type); GLenum UniformComponentType(GLenum type); size_t UniformInternalSize(GLenum type); size_t UniformExternalSize(GLenum type); @@ -34,6 +29,7 @@ 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); @@ -53,69 +49,18 @@ bool IsStencilRenderable(GLenum internalformat); bool IsFloat32Format(GLint internalformat); bool IsFloat16Format(GLint internalformat); -} - -namespace es2dx -{ - -D3DCMPFUNC ConvertComparison(GLenum comparison); -D3DCOLOR ConvertColor(gl::Color color); -D3DBLEND ConvertBlendFunc(GLenum blend); -D3DBLENDOP ConvertBlendOp(GLenum blendOp); -D3DSTENCILOP ConvertStencilOp(GLenum stencilOp); -D3DTEXTUREADDRESS ConvertTextureWrap(GLenum wrap); -D3DCULL ConvertCullMode(GLenum cullFace, GLenum frontFace); -D3DCUBEMAP_FACES ConvertCubeFace(GLenum cubeFace); -DWORD ConvertColorMask(bool red, bool green, bool blue, bool alpha); -D3DTEXTUREFILTERTYPE ConvertMagFilter(GLenum magFilter, float maxAnisotropy); -void ConvertMinFilter(GLenum minFilter, D3DTEXTUREFILTERTYPE *d3dMinFilter, D3DTEXTUREFILTERTYPE *d3dMipFilter, float maxAnisotropy); -bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount, - D3DPRIMITIVETYPE *d3dPrimitiveType, int *d3dPrimitiveCount); -D3DFORMAT ConvertRenderbufferFormat(GLenum format); -D3DMULTISAMPLE_TYPE GetMultisampleTypeFromSamples(GLsizei samples); - -} - -namespace dx2es -{ - -GLuint GetAlphaSize(D3DFORMAT colorFormat); -GLuint GetRedSize(D3DFORMAT colorFormat); -GLuint GetGreenSize(D3DFORMAT colorFormat); -GLuint GetBlueSize(D3DFORMAT colorFormat); -GLuint GetDepthSize(D3DFORMAT depthFormat); -GLuint GetStencilSize(D3DFORMAT stencilFormat); - -GLsizei GetSamplesFromMultisampleType(D3DMULTISAMPLE_TYPE type); - -bool IsFormatChannelEquivalent(D3DFORMAT d3dformat, GLenum format); -bool ConvertReadBufferFormat(D3DFORMAT d3dformat, GLenum *format, GLenum *type); -GLenum ConvertBackBufferFormat(D3DFORMAT format); -GLenum ConvertDepthStencilFormat(D3DFORMAT format); -} +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); -namespace dx -{ -bool IsCompressedFormat(D3DFORMAT format); -size_t ComputeRowSize(D3DFORMAT format, unsigned int width); } std::string getTempPath(); void writeFile(const char* path, const void* data, size_t size); -inline bool isDeviceLostError(HRESULT errorCode) -{ - switch (errorCode) - { - case D3DERR_DRIVERINTERNALERROR: - case D3DERR_DEVICELOST: - case D3DERR_DEVICEHUNG: - case D3DERR_DEVICEREMOVED: - return true; - default: - return false; - } -}; - #endif // LIBGLESV2_UTILITIES_H |