From 710ad8ce1bd5d01ce048851d210ac3831ca17dde Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Wed, 3 Apr 2013 19:57:09 +0300 Subject: Upgrade ANGLE to DX11 Proto Upgrades ANGLE to dx11proto (dx11-MRT-support tag), which splits out support for DirectX9 & DirectX11. The DX9 codepath is used by default; CONFIG+=angle_d3d11 must be passed to the ANGLE project to build for DX11. Existing patches to ANGLE have been updated (or removed if no longer needed), and a patch has been added to make DX9/DX11 codepaths mutually exclusive. Change-Id: Ibe13befadb94f04883eca449d0ee1f0da955ff92 Reviewed-by: Oswald Buddenhagen Reviewed-by: Gunnar Sletta Reviewed-by: Friedemann Kleint Reviewed-by: Axel Waggershauser --- .../angle/src/libGLESv2/renderer/RenderTarget.h | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/3rdparty/angle/src/libGLESv2/renderer/RenderTarget.h (limited to 'src/3rdparty/angle/src/libGLESv2/renderer/RenderTarget.h') diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/RenderTarget.h b/src/3rdparty/angle/src/libGLESv2/renderer/RenderTarget.h new file mode 100644 index 0000000000..80de39f4f7 --- /dev/null +++ b/src/3rdparty/angle/src/libGLESv2/renderer/RenderTarget.h @@ -0,0 +1,56 @@ +// +// Copyright (c) 2012 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. +// + +// RenderTarget.h: Defines an abstract wrapper class to manage IDirect3DSurface9 +// and ID3D11View objects belonging to renderbuffers. + +#ifndef LIBGLESV2_RENDERER_RENDERTARGET_H_ +#define LIBGLESV2_RENDERER_RENDERTARGET_H_ + +#include "common/angleutils.h" + +namespace rx +{ +class RenderTarget +{ + public: + RenderTarget() + { + mWidth = 0; + mHeight = 0; + mInternalFormat = GL_NONE; + mActualFormat = GL_NONE; + mSamples = 0; + } + + virtual ~RenderTarget() {}; + + GLsizei getWidth() { return mWidth; } + GLsizei getHeight() { return mHeight; } + GLenum getInternalFormat() { return mInternalFormat; } + GLenum getActualFormat() { return mActualFormat; } + GLsizei getSamples() { return mSamples; } + + struct Desc { + GLsizei width; + GLsizei height; + GLenum format; + }; + + protected: + GLsizei mWidth; + GLsizei mHeight; + GLenum mInternalFormat; + GLenum mActualFormat; + GLsizei mSamples; + + private: + DISALLOW_COPY_AND_ASSIGN(RenderTarget); +}; + +} + +#endif // LIBGLESV2_RENDERTARGET_H_ -- cgit v1.2.3