Commit 6cec8509 by Geoff Lang

Re-enable RTTI and fix compilation errors.

BUG=angle:616 Change-Id: I964ddc4a3d51d5f202608e3162edb684290cbc6a Reviewed-on: https://chromium-review.googlesource.com/195731Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 10567260
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
#'ExceptionHandling': '0', #'ExceptionHandling': '0',
'EnableFunctionLevelLinking': 'true', 'EnableFunctionLevelLinking': 'true',
'MinimalRebuild': 'false', 'MinimalRebuild': 'false',
'RuntimeTypeInfo': 'false', 'RuntimeTypeInfo': 'true',
'WarningLevel': '4', 'WarningLevel': '4',
}, },
'VCLinkerTool': 'VCLinkerTool':
......
...@@ -301,7 +301,7 @@ ID3D11Buffer *BufferStorage11::getBuffer(BufferUsage usage) ...@@ -301,7 +301,7 @@ ID3D11Buffer *BufferStorage11::getBuffer(BufferUsage usage)
markBufferUsage(); markBufferUsage();
TypedBufferStorage11 *typedBuffer = getStorage(usage); TypedBufferStorage11 *typedBuffer = getStorage(usage);
ASSERT(HAS_DYNAMIC_TYPE(typedBuffer, NativeBuffer11)); ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, typedBuffer));
return static_cast<NativeBuffer11*>(typedBuffer)->getNativeBuffer(); return static_cast<NativeBuffer11*>(typedBuffer)->getNativeBuffer();
} }
...@@ -309,7 +309,7 @@ ID3D11Buffer *BufferStorage11::getBuffer(BufferUsage usage) ...@@ -309,7 +309,7 @@ ID3D11Buffer *BufferStorage11::getBuffer(BufferUsage usage)
ID3D11ShaderResourceView *BufferStorage11::getSRV(DXGI_FORMAT srvFormat) ID3D11ShaderResourceView *BufferStorage11::getSRV(DXGI_FORMAT srvFormat)
{ {
TypedBufferStorage11 *storage = getStorage(BUFFER_USAGE_PIXEL_UNPACK); TypedBufferStorage11 *storage = getStorage(BUFFER_USAGE_PIXEL_UNPACK);
ASSERT(HAS_DYNAMIC_TYPE(storage, NativeBuffer11)); ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, storage));
ID3D11Buffer *buffer = static_cast<NativeBuffer11*>(storage)->getNativeBuffer(); ID3D11Buffer *buffer = static_cast<NativeBuffer11*>(storage)->getNativeBuffer();
auto bufferSRVIt = mBufferResourceViews.find(srvFormat); auto bufferSRVIt = mBufferResourceViews.find(srvFormat);
...@@ -474,7 +474,7 @@ bool BufferStorage11::NativeBuffer11::copyFromStorage(TypedBufferStorage11 *sour ...@@ -474,7 +474,7 @@ bool BufferStorage11::NativeBuffer11::copyFromStorage(TypedBufferStorage11 *sour
return false; return false;
} }
ASSERT(HAS_DYNAMIC_TYPE(source, NativeBuffer11)); ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, source));
ID3D11DeviceContext *context = mRenderer->getDeviceContext(); ID3D11DeviceContext *context = mRenderer->getDeviceContext();
...@@ -496,7 +496,7 @@ bool BufferStorage11::NativeBuffer11::copyFromStorage(TypedBufferStorage11 *sour ...@@ -496,7 +496,7 @@ bool BufferStorage11::NativeBuffer11::copyFromStorage(TypedBufferStorage11 *sour
srcBox.front = 0; srcBox.front = 0;
srcBox.back = 1; srcBox.back = 1;
ASSERT(HAS_DYNAMIC_TYPE(source, NativeBuffer11)); ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, source));
ID3D11Buffer *sourceBuffer = static_cast<NativeBuffer11*>(source)->getNativeBuffer(); ID3D11Buffer *sourceBuffer = static_cast<NativeBuffer11*>(source)->getNativeBuffer();
context->CopySubresourceRegion(mNativeBuffer, 0, destOffset, 0, 0, sourceBuffer, 0, &srcBox); context->CopySubresourceRegion(mNativeBuffer, 0, destOffset, 0, 0, sourceBuffer, 0, &srcBox);
......
...@@ -104,7 +104,7 @@ UniformStorage11::~UniformStorage11() ...@@ -104,7 +104,7 @@ UniformStorage11::~UniformStorage11()
const UniformStorage11 *UniformStorage11::makeUniformStorage11(const UniformStorage *uniformStorage) const UniformStorage11 *UniformStorage11::makeUniformStorage11(const UniformStorage *uniformStorage)
{ {
ASSERT(HAS_DYNAMIC_TYPE(UniformStorage11*, uniformStorage)); ASSERT(HAS_DYNAMIC_TYPE(const UniformStorage11*, uniformStorage));
return static_cast<const UniformStorage11*>(uniformStorage); return static_cast<const UniformStorage11*>(uniformStorage);
} }
......
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