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/QueryImpl.h | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/3rdparty/angle/src/libGLESv2/renderer/QueryImpl.h (limited to 'src/3rdparty/angle/src/libGLESv2/renderer/QueryImpl.h') diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/QueryImpl.h b/src/3rdparty/angle/src/libGLESv2/renderer/QueryImpl.h new file mode 100644 index 0000000000..a874047b0c --- /dev/null +++ b/src/3rdparty/angle/src/libGLESv2/renderer/QueryImpl.h @@ -0,0 +1,42 @@ +// +// Copyright (c) 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. +// + +// QueryImpl.h: Defines the abstract rx::QueryImpl class. + +#ifndef LIBGLESV2_RENDERER_QUERYIMPL_H_ +#define LIBGLESV2_RENDERER_QUERYIMPL_H_ + +#include "common/angleutils.h" + +namespace rx +{ + +class QueryImpl +{ + public: + explicit QueryImpl(GLenum type) : mType(type), mStatus(GL_FALSE), mResult(0) { } + virtual ~QueryImpl() { } + + virtual void begin() = 0; + virtual void end() = 0; + virtual GLuint getResult() = 0; + virtual GLboolean isResultAvailable() = 0; + + GLenum getType() const { return mType; } + + protected: + GLuint mResult; + GLboolean mStatus; + + private: + DISALLOW_COPY_AND_ASSIGN(QueryImpl); + + GLenum mType; +}; + +} + +#endif // LIBGLESV2_RENDERER_QUERYIMPL_H_ -- cgit v1.2.3