From 710ad8ce1bd5d01ce048851d210ac3831ca17dde Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
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 <oswald.buddenhagen@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Axel Waggershauser <awagger@gmail.com>
---
 .../angle/src/compiler/preprocessor/Input.h        | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 src/3rdparty/angle/src/compiler/preprocessor/Input.h

(limited to 'src/3rdparty/angle/src/compiler/preprocessor/Input.h')

diff --git a/src/3rdparty/angle/src/compiler/preprocessor/Input.h b/src/3rdparty/angle/src/compiler/preprocessor/Input.h
new file mode 100644
index 0000000000..14b7597cb4
--- /dev/null
+++ b/src/3rdparty/angle/src/compiler/preprocessor/Input.h
@@ -0,0 +1,49 @@
+//
+// Copyright (c) 2011 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.
+//
+
+#ifndef COMPILER_PREPROCESSOR_INPUT_H_
+#define COMPILER_PREPROCESSOR_INPUT_H_
+
+#include <stddef.h>
+#include <vector>
+
+namespace pp
+{
+
+// Holds and reads input for Lexer.
+class Input
+{
+  public:
+    Input();
+    Input(size_t count, const char* const string[], const int length[]);
+
+    size_t count() const { return mCount; }
+    const char* string(size_t index) const { return mString[index]; }
+    size_t length(size_t index) const { return mLength[index]; }
+
+    size_t read(char* buf, size_t maxSize);
+
+    struct Location
+    {
+        size_t sIndex;  // String index;
+        size_t cIndex;  // Char index.
+
+        Location() : sIndex(0), cIndex(0) { }
+    };
+    const Location& readLoc() const { return mReadLoc; }
+
+  private:
+    // Input.
+    size_t mCount;
+    const char* const* mString;
+    std::vector<size_t> mLength;
+
+    Location mReadLoc;
+};
+
+}  // namespace pp
+#endif  // COMPILER_PREPROCESSOR_INPUT_H_
+
-- 
cgit v1.2.3