Renames "dx9" utility namespace to "d3d9"

TRAC #22208 Author: Shannon Woods Signed-off-by: Geoff Lang Signed-off-by: Daniel Koch git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1591 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 8fb65c8f
...@@ -127,8 +127,8 @@ void Image9::copyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface9 *so ...@@ -127,8 +127,8 @@ void Image9::copyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface9 *so
D3DSURFACE_DESC desc; D3DSURFACE_DESC desc;
source->GetDesc(&desc); source->GetDesc(&desc);
int rows = dx::IsCompressedFormat(desc.Format) ? desc.Height / 4 : desc.Height; int rows = d3d9::IsCompressedFormat(desc.Format) ? desc.Height / 4 : desc.Height;
int bytes = dx::ComputeRowSize(desc.Format, desc.Width); int bytes = d3d9::ComputeRowSize(desc.Format, desc.Width);
ASSERT(bytes <= sourceLock.Pitch && bytes <= destLock.Pitch); ASSERT(bytes <= sourceLock.Pitch && bytes <= destLock.Pitch);
for(int i = 0; i < rows; i++) for(int i = 0; i < rows; i++)
......
...@@ -448,7 +448,7 @@ GLenum GetEquivalentFormat(D3DFORMAT format) ...@@ -448,7 +448,7 @@ GLenum GetEquivalentFormat(D3DFORMAT format)
} }
namespace dx namespace d3d9
{ {
bool IsCompressedFormat(D3DFORMAT surfaceFormat) bool IsCompressedFormat(D3DFORMAT surfaceFormat)
......
...@@ -56,7 +56,7 @@ GLenum GetEquivalentFormat(D3DFORMAT format); ...@@ -56,7 +56,7 @@ GLenum GetEquivalentFormat(D3DFORMAT format);
} }
namespace dx namespace d3d9
{ {
bool IsCompressedFormat(D3DFORMAT format); bool IsCompressedFormat(D3DFORMAT format);
size_t ComputeRowSize(D3DFORMAT format, unsigned int width); size_t ComputeRowSize(D3DFORMAT format, unsigned int width);
......
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