summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/libGLESv2/Fence.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/Fence.h')
-rw-r--r--src/3rdparty/angle/src/libGLESv2/Fence.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/Fence.h b/src/3rdparty/angle/src/libGLESv2/Fence.h
index 9626cb0ff0..1cedebb112 100644
--- a/src/3rdparty/angle/src/libGLESv2/Fence.h
+++ b/src/3rdparty/angle/src/libGLESv2/Fence.h
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-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.
//
@@ -9,15 +9,12 @@
#ifndef LIBGLESV2_FENCE_H_
#define LIBGLESV2_FENCE_H_
-#define GL_APICALL
-#include <GLES2/gl2.h>
-#include <d3d9.h>
-
#include "common/angleutils.h"
-namespace egl
+namespace rx
{
-class Display;
+class Renderer;
+class FenceImpl;
}
namespace gl
@@ -26,7 +23,7 @@ namespace gl
class Fence
{
public:
- explicit Fence(egl::Display* display);
+ explicit Fence(rx::Renderer *renderer);
virtual ~Fence();
GLboolean isFence();
@@ -38,10 +35,7 @@ class Fence
private:
DISALLOW_COPY_AND_ASSIGN(Fence);
- egl::Display* mDisplay;
- IDirect3DQuery9* mQuery;
- GLenum mCondition;
- GLboolean mStatus;
+ rx::FenceImpl *mFence;
};
}