Added a fence creation method to Renderer.

TRAC #22418 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1844 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent dbbe605a
...@@ -57,6 +57,7 @@ class TextureStorageInterfaceCube; ...@@ -57,6 +57,7 @@ class TextureStorageInterfaceCube;
class VertexBuffer; class VertexBuffer;
class IndexBuffer; class IndexBuffer;
class QueryImpl; class QueryImpl;
class FenceImpl;
class Blit; class Blit;
struct TranslatedIndexData; struct TranslatedIndexData;
...@@ -209,8 +210,9 @@ class Renderer ...@@ -209,8 +210,9 @@ class Renderer
virtual VertexBuffer *createVertexBuffer() = 0; virtual VertexBuffer *createVertexBuffer() = 0;
virtual IndexBuffer *createIndexBuffer() = 0; virtual IndexBuffer *createIndexBuffer() = 0;
// Query creation // Query and Fence creation
virtual QueryImpl *createQuery(GLenum type) = 0; virtual QueryImpl *createQuery(GLenum type) = 0;
virtual FenceImpl *createFence() = 0;
protected: protected:
bool initializeCompiler(); bool initializeCompiler();
......
...@@ -2547,13 +2547,20 @@ VertexBuffer *Renderer11::createVertexBuffer() ...@@ -2547,13 +2547,20 @@ VertexBuffer *Renderer11::createVertexBuffer()
IndexBuffer *Renderer11::createIndexBuffer() IndexBuffer *Renderer11::createIndexBuffer()
{ {
return new IndexBuffer11(this); return new IndexBuffer11(this);
} }
QueryImpl *Renderer11::createQuery(GLenum type) QueryImpl *Renderer11::createQuery(GLenum type)
{ {
// TODO // TODO
UNIMPLEMENTED(); UNIMPLEMENTED();
return NULL; return NULL;
}
FenceImpl *Renderer11::createFence()
{
// TODO
UNIMPLEMENTED();
return NULL;
} }
bool Renderer11::getRenderTargetResource(gl::Framebuffer *framebuffer, unsigned int *subresourceIndex, ID3D11Texture2D **resource) bool Renderer11::getRenderTargetResource(gl::Framebuffer *framebuffer, unsigned int *subresourceIndex, ID3D11Texture2D **resource)
......
...@@ -164,8 +164,9 @@ class Renderer11 : public Renderer ...@@ -164,8 +164,9 @@ class Renderer11 : public Renderer
virtual VertexBuffer *createVertexBuffer(); virtual VertexBuffer *createVertexBuffer();
virtual IndexBuffer *createIndexBuffer(); virtual IndexBuffer *createIndexBuffer();
// Query creation // Query and Fence creation
virtual QueryImpl *createQuery(GLenum type); virtual QueryImpl *createQuery(GLenum type);
virtual FenceImpl *createFence();
// D3D11-renderer specific methods // D3D11-renderer specific methods
ID3D11Device *getDevice() { return mDevice; } ID3D11Device *getDevice() { return mDevice; }
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "libGLESv2/renderer/VertexBuffer9.h" #include "libGLESv2/renderer/VertexBuffer9.h"
#include "libGLESv2/renderer/IndexBuffer9.h" #include "libGLESv2/renderer/IndexBuffer9.h"
#include "libGLESv2/renderer/Query9.h" #include "libGLESv2/renderer/Query9.h"
#include "libGLESv2/renderer/Fence9.h"
#include <sstream> #include <sstream>
...@@ -711,6 +712,11 @@ QueryImpl *Renderer9::createQuery(GLenum type) ...@@ -711,6 +712,11 @@ QueryImpl *Renderer9::createQuery(GLenum type)
return new Query9(this, type); return new Query9(this, type);
} }
FenceImpl *Renderer9::createFence()
{
return new Fence9(this);
}
void Renderer9::setSamplerState(gl::SamplerType type, int index, const gl::SamplerState &samplerState) void Renderer9::setSamplerState(gl::SamplerType type, int index, const gl::SamplerState &samplerState)
{ {
bool *forceSetSamplers = (type == gl::SAMPLER_PIXEL) ? mForceSetPixelSamplerStates : mForceSetVertexSamplerStates; bool *forceSetSamplers = (type == gl::SAMPLER_PIXEL) ? mForceSetPixelSamplerStates : mForceSetVertexSamplerStates;
......
...@@ -194,8 +194,9 @@ class Renderer9 : public Renderer ...@@ -194,8 +194,9 @@ class Renderer9 : public Renderer
virtual VertexBuffer *createVertexBuffer(); virtual VertexBuffer *createVertexBuffer();
virtual IndexBuffer *createIndexBuffer(); virtual IndexBuffer *createIndexBuffer();
// Query creation // Query and Fence creation
virtual QueryImpl *createQuery(GLenum type); virtual QueryImpl *createQuery(GLenum type);
virtual FenceImpl *createFence();
// D3D9-renderer specific methods // D3D9-renderer specific methods
bool boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest); bool boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment