Renamed IsDepthFormat/IsStencilFormat to IsDepthTextureFormat/IsStencilTextureFormat.

TRAC #20959 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@1156 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent dbd65656
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1155 #define BUILD_REVISION 1156
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -318,7 +318,7 @@ GLenum Framebuffer::completeness() ...@@ -318,7 +318,7 @@ GLenum Framebuffer::completeness()
return GL_FRAMEBUFFER_UNSUPPORTED; return GL_FRAMEBUFFER_UNSUPPORTED;
} }
if (dx2es::IsDepthFormat(d3dformat) || dx2es::IsStencilFormat(d3dformat)) if (dx2es::IsDepthTextureFormat(d3dformat) || dx2es::IsStencilTextureFormat(d3dformat))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
...@@ -369,7 +369,7 @@ GLenum Framebuffer::completeness() ...@@ -369,7 +369,7 @@ GLenum Framebuffer::completeness()
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
if (!dx2es::IsDepthFormat(d3dformat)) if (!dx2es::IsDepthTextureFormat(d3dformat))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
...@@ -429,7 +429,7 @@ GLenum Framebuffer::completeness() ...@@ -429,7 +429,7 @@ GLenum Framebuffer::completeness()
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
if (!dx2es::IsStencilFormat(d3dformat)) if (!dx2es::IsStencilTextureFormat(d3dformat))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
......
// //
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -948,12 +948,12 @@ bool IsFloat16Format(D3DFORMAT surfaceFormat) ...@@ -948,12 +948,12 @@ bool IsFloat16Format(D3DFORMAT surfaceFormat)
return false; return false;
} }
bool IsDepthFormat(D3DFORMAT surfaceFormat) bool IsDepthTextureFormat(D3DFORMAT surfaceFormat)
{ {
return (surfaceFormat == D3DFMT_INTZ); return (surfaceFormat == D3DFMT_INTZ);
} }
bool IsStencilFormat(D3DFORMAT surfaceFormat) bool IsStencilTextureFormat(D3DFORMAT surfaceFormat)
{ {
return (surfaceFormat == D3DFMT_INTZ); return (surfaceFormat == D3DFMT_INTZ);
} }
......
// //
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -82,8 +82,8 @@ GLuint GetDepthSize(D3DFORMAT depthFormat); ...@@ -82,8 +82,8 @@ GLuint GetDepthSize(D3DFORMAT depthFormat);
GLuint GetStencilSize(D3DFORMAT stencilFormat); GLuint GetStencilSize(D3DFORMAT stencilFormat);
bool IsFloat32Format(D3DFORMAT surfaceFormat); bool IsFloat32Format(D3DFORMAT surfaceFormat);
bool IsFloat16Format(D3DFORMAT surfaceFormat); bool IsFloat16Format(D3DFORMAT surfaceFormat);
bool IsDepthFormat(D3DFORMAT surfaceFormat); bool IsDepthTextureFormat(D3DFORMAT surfaceFormat);
bool IsStencilFormat(D3DFORMAT surfaceFormat); bool IsStencilTextureFormat(D3DFORMAT surfaceFormat);
GLsizei GetSamplesFromMultisampleType(D3DMULTISAMPLE_TYPE type); GLsizei GetSamplesFromMultisampleType(D3DMULTISAMPLE_TYPE type);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment