Remove D3D9 header included in the D3D11 path, and some references to D3DERR.

TRAC #22499 Signed-off-by: Geoff Lang Signed-off-by: Nicolas Capens Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1902 736b8ea6-26fd-11df-bfd4-992fa37f6226

Remove D3D9 header included in the D3D11 path, and some references to D3DERR.
8d8814b7 · shannon.woods@transgaming.com · a9a509e0 · 8d8814b7 · 8d8814b7
Commit 8d8814b7 authored Feb 28, 2013 by shannon.woods@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

RenderTarget11.cpp src/libGLESv2/renderer/RenderTarget11.cpp +4 -6

TextureStorage.h src/libGLESv2/renderer/TextureStorage.h +0 -1

No files found.
--- a/src/libGLESv2/renderer/RenderTarget11.cpp
+++ b/src/libGLESv2/renderer/RenderTarget11.cpp
@@ -205,8 +205,6 @@ RenderTarget11::RenderTarget11(Renderer *renderer, GLsizei width, GLsizei height
        return;
    }

-    HRESULT result = D3DERR_INVALIDCALL;
-
    if (width > 0 && height > 0)
    {
        // Create texture resource
@@ -226,7 +224,7 @@ RenderTarget11::RenderTarget11(Renderer *renderer, GLsizei width, GLsizei height
        ID3D11Device *device = mRenderer->getDevice();
        HRESULT result = device->CreateTexture2D(&desc, NULL, &mTexture);

-        if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
+        if (result == E_OUTOFMEMORY)
        {
            gl::error(GL_OUT_OF_MEMORY);
            return;
@@ -242,7 +240,7 @@ RenderTarget11::RenderTarget11(Renderer *renderer, GLsizei width, GLsizei height
            dsvDesc.Flags = 0;
            result = device->CreateDepthStencilView(mTexture, &dsvDesc, &mDepthStencil);

-            if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
+            if (result == E_OUTOFMEMORY)
            {
                mTexture->Release();
                mTexture = NULL;
@@ -258,7 +256,7 @@ RenderTarget11::RenderTarget11(Renderer *renderer, GLsizei width, GLsizei height
            rtvDesc.Texture2D.MipSlice = 0;
            result = device->CreateRenderTargetView(mTexture, &rtvDesc, &mRenderTarget);

-            if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
+            if (result == E_OUTOFMEMORY)
            {
                mTexture->Release();
                mTexture = NULL;
@@ -274,7 +272,7 @@ RenderTarget11::RenderTarget11(Renderer *renderer, GLsizei width, GLsizei height
            srvDesc.Texture2D.MipLevels = 1;
            result = device->CreateShaderResourceView(mTexture, &srvDesc, &mShaderResource);

-            if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
+            if (result == E_OUTOFMEMORY)
            {
                mTexture->Release();
                mTexture = NULL;

--- a/src/libGLESv2/renderer/TextureStorage.h
+++ b/src/libGLESv2/renderer/TextureStorage.h
@@ -13,7 +13,6 @@

 #define GL_APICALL
 #include <GLES2/gl2.h>
-#include <d3d9.h>

 #include "common/debug.h"