Enclose error(GLint) and error(EGLint) into gl and egl namespaces.
This should generate a compile time error if we try to call the wrong function.
TRAC #22411
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1856 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/Blit.cpp b/src/libGLESv2/renderer/Blit.cpp
index ec23121..74c4480 100644
--- a/src/libGLESv2/renderer/Blit.cpp
+++ b/src/libGLESv2/renderer/Blit.cpp
@@ -85,7 +85,7 @@
if (FAILED(result))
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
void *lockPtr = NULL;
@@ -94,7 +94,7 @@
if (FAILED(result) || lockPtr == NULL)
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
memcpy(lockPtr, quad, sizeof(quad));
@@ -111,7 +111,7 @@
if (FAILED(result))
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -230,7 +230,7 @@
if (!source)
{
ERR("Failed to retrieve the render target.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
TextureStorage9_2D *storage9 = TextureStorage9_2D::makeTextureStorage9_2D(storage->getStorageInstance());
@@ -266,7 +266,7 @@
if (!source)
{
ERR("Failed to retrieve the render target.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
TextureStorage9_Cube *storage9 = TextureStorage9_Cube::makeTextureStorage9_Cube(storage->getStorageInstance());
@@ -306,7 +306,7 @@
if (FAILED(result))
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
}
else
@@ -428,7 +428,7 @@
if (FAILED(result))
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
- return error(GL_OUT_OF_MEMORY, (IDirect3DTexture9*)NULL);
+ return gl::error(GL_OUT_OF_MEMORY, (IDirect3DTexture9*)NULL);
}
IDirect3DSurface9 *textureSurface;
@@ -438,7 +438,7 @@
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
texture->Release();
- return error(GL_OUT_OF_MEMORY, (IDirect3DTexture9*)NULL);
+ return gl::error(GL_OUT_OF_MEMORY, (IDirect3DTexture9*)NULL);
}
mRenderer->endScene();
@@ -450,7 +450,7 @@
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
texture->Release();
- return error(GL_OUT_OF_MEMORY, (IDirect3DTexture9*)NULL);
+ return gl::error(GL_OUT_OF_MEMORY, (IDirect3DTexture9*)NULL);
}
return texture;
diff --git a/src/libGLESv2/renderer/Fence11.cpp b/src/libGLESv2/renderer/Fence11.cpp
index 2959a0a..2ed7975 100644
--- a/src/libGLESv2/renderer/Fence11.cpp
+++ b/src/libGLESv2/renderer/Fence11.cpp
@@ -44,7 +44,7 @@
if (FAILED(mRenderer->getDevice()->CreateQuery(&queryDesc, &mQuery)))
{
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -58,14 +58,14 @@
{
if (mQuery == NULL)
{
- return error(GL_INVALID_OPERATION, GL_TRUE);
+ return gl::error(GL_INVALID_OPERATION, GL_TRUE);
}
HRESULT result = mRenderer->getDeviceContext()->GetData(mQuery, NULL, 0, 0);
if (mRenderer->isDeviceLost())
{
- return error(GL_OUT_OF_MEMORY, GL_TRUE);
+ return gl::error(GL_OUT_OF_MEMORY, GL_TRUE);
}
ASSERT(result == S_OK || result == S_FALSE);
@@ -77,7 +77,7 @@
{
if (mQuery == NULL)
{
- return error(GL_INVALID_OPERATION);
+ return gl::error(GL_INVALID_OPERATION);
}
while (!testFence())
@@ -90,7 +90,7 @@
{
if (mQuery == NULL)
{
- return error(GL_INVALID_OPERATION);
+ return gl::error(GL_INVALID_OPERATION);
}
switch (pname)
@@ -111,7 +111,7 @@
if (mRenderer->isDeviceLost())
{
params[0] = GL_TRUE;
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
ASSERT(result == S_OK || result == S_FALSE);
@@ -124,7 +124,7 @@
params[0] = getCondition();
break;
default:
- return error(GL_INVALID_ENUM);
+ return gl::error(GL_INVALID_ENUM);
break;
}
}
diff --git a/src/libGLESv2/renderer/Fence9.cpp b/src/libGLESv2/renderer/Fence9.cpp
index 50a42ca..74abfcf 100644
--- a/src/libGLESv2/renderer/Fence9.cpp
+++ b/src/libGLESv2/renderer/Fence9.cpp
@@ -42,7 +42,7 @@
mQuery = mRenderer->allocateEventQuery();
if (!mQuery)
{
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -57,7 +57,7 @@
{
if (mQuery == NULL)
{
- return error(GL_INVALID_OPERATION, GL_TRUE);
+ return gl::error(GL_INVALID_OPERATION, GL_TRUE);
}
HRESULT result = mQuery->GetData(NULL, 0, D3DGETDATA_FLUSH);
@@ -65,7 +65,7 @@
if (d3d9::isDeviceLostError(result))
{
mRenderer->notifyDeviceLost();
- return error(GL_OUT_OF_MEMORY, GL_TRUE);
+ return gl::error(GL_OUT_OF_MEMORY, GL_TRUE);
}
ASSERT(result == S_OK || result == S_FALSE);
@@ -77,7 +77,7 @@
{
if (mQuery == NULL)
{
- return error(GL_INVALID_OPERATION);
+ return gl::error(GL_INVALID_OPERATION);
}
while (!testFence())
@@ -90,7 +90,7 @@
{
if (mQuery == NULL)
{
- return error(GL_INVALID_OPERATION);
+ return gl::error(GL_INVALID_OPERATION);
}
switch (pname)
@@ -112,7 +112,7 @@
{
params[0] = GL_TRUE;
mRenderer->notifyDeviceLost();
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
ASSERT(result == S_OK || result == S_FALSE);
@@ -125,7 +125,7 @@
params[0] = getCondition();
break;
default:
- return error(GL_INVALID_ENUM);
+ return gl::error(GL_INVALID_ENUM);
break;
}
}
diff --git a/src/libGLESv2/renderer/Image11.cpp b/src/libGLESv2/renderer/Image11.cpp
index 26b1413..41dc670 100644
--- a/src/libGLESv2/renderer/Image11.cpp
+++ b/src/libGLESv2/renderer/Image11.cpp
@@ -389,7 +389,7 @@
{
ASSERT(result == E_OUTOFMEMORY);
ERR("Creating image failed.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
diff --git a/src/libGLESv2/renderer/Image9.cpp b/src/libGLESv2/renderer/Image9.cpp
index 453b8fc..060fa20 100644
--- a/src/libGLESv2/renderer/Image9.cpp
+++ b/src/libGLESv2/renderer/Image9.cpp
@@ -106,7 +106,7 @@
{
IDirect3DSurface9 *sourceSurface = source->getSurface();
if (sourceSurface == NULL)
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
IDirect3DSurface9 *destSurface = dest->getSurface();
generateMip(destSurface, sourceSurface);
@@ -199,7 +199,7 @@
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
ERR("Creating image surface failed.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
newTexture->GetSurfaceLevel(levelToFetch, &newSurface);
@@ -500,7 +500,7 @@
if (!surface)
{
ERR("Failed to retrieve the render target.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
IDirect3DDevice9 *device = mRenderer->getDevice();
@@ -515,7 +515,7 @@
{
ERR("Could not create matching destination surface.");
surface->Release();
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
result = device->GetRenderTargetData(surface, renderTargetData);
@@ -525,7 +525,7 @@
ERR("GetRenderTargetData unexpectedly failed.");
renderTargetData->Release();
surface->Release();
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
RECT sourceRect = {x, y, x + width, y + height};
@@ -539,7 +539,7 @@
ERR("Failed to lock the source surface (rectangle might be invalid).");
renderTargetData->Release();
surface->Release();
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
D3DLOCKED_RECT destLock = {0};
@@ -551,7 +551,7 @@
renderTargetData->UnlockRect();
renderTargetData->Release();
surface->Release();
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
if (destLock.pBits && sourceLock.pBits)
diff --git a/src/libGLESv2/renderer/Query11.cpp b/src/libGLESv2/renderer/Query11.cpp
index 7db198c..629b27d 100644
--- a/src/libGLESv2/renderer/Query11.cpp
+++ b/src/libGLESv2/renderer/Query11.cpp
@@ -37,7 +37,7 @@
if (FAILED(mRenderer->getDevice()->CreateQuery(&queryDesc, &mQuery)))
{
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -48,7 +48,7 @@
{
if (mQuery == NULL)
{
- return error(GL_INVALID_OPERATION);
+ return gl::error(GL_INVALID_OPERATION);
}
mRenderer->getDeviceContext()->End(mQuery);
@@ -68,7 +68,7 @@
// if the device is lost
if (mRenderer->testDeviceLost(true))
{
- return error(GL_OUT_OF_MEMORY, 0);
+ return gl::error(GL_OUT_OF_MEMORY, 0);
}
}
}
@@ -108,7 +108,7 @@
}
else if (mRenderer->testDeviceLost(true))
{
- return error(GL_OUT_OF_MEMORY, GL_TRUE);
+ return gl::error(GL_OUT_OF_MEMORY, GL_TRUE);
}
return getStatus();
diff --git a/src/libGLESv2/renderer/Query9.cpp b/src/libGLESv2/renderer/Query9.cpp
index 2904e0e..0d1b9a9 100644
--- a/src/libGLESv2/renderer/Query9.cpp
+++ b/src/libGLESv2/renderer/Query9.cpp
@@ -35,7 +35,7 @@
{
if (FAILED(mRenderer->getDevice()->CreateQuery(D3DQUERYTYPE_OCCLUSION, &mQuery)))
{
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -47,7 +47,7 @@
{
if (mQuery == NULL)
{
- return error(GL_INVALID_OPERATION);
+ return gl::error(GL_INVALID_OPERATION);
}
HRESULT result = mQuery->Issue(D3DISSUE_END);
@@ -69,7 +69,7 @@
// instead of D3DERR_DEVICELOST like they should
if (mRenderer->testDeviceLost(true))
{
- return error(GL_OUT_OF_MEMORY, 0);
+ return gl::error(GL_OUT_OF_MEMORY, 0);
}
}
}
@@ -111,7 +111,7 @@
else if (d3d9::isDeviceLostError(hres))
{
mRenderer->notifyDeviceLost();
- return error(GL_OUT_OF_MEMORY, GL_TRUE);
+ return gl::error(GL_OUT_OF_MEMORY, GL_TRUE);
}
return getStatus();
diff --git a/src/libGLESv2/renderer/RenderTarget11.cpp b/src/libGLESv2/renderer/RenderTarget11.cpp
index 5f16b79..37d777b 100644
--- a/src/libGLESv2/renderer/RenderTarget11.cpp
+++ b/src/libGLESv2/renderer/RenderTarget11.cpp
@@ -233,7 +233,7 @@
if (supportedSamples == -1)
{
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
return;
}
@@ -262,7 +262,7 @@
if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
{
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
return;
}
ASSERT(SUCCEEDED(result));
@@ -279,7 +279,7 @@
if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
{
rtTexture->Release();
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
return;
}
ASSERT(SUCCEEDED(result));
@@ -295,7 +295,7 @@
if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
{
rtTexture->Release();
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
return;
}
ASSERT(SUCCEEDED(result));
@@ -311,7 +311,7 @@
{
rtTexture->Release();
mRenderTarget->Release();
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
return;
}
ASSERT(SUCCEEDED(result));
diff --git a/src/libGLESv2/renderer/RenderTarget9.cpp b/src/libGLESv2/renderer/RenderTarget9.cpp
index ff83c45..9d5aae4 100644
--- a/src/libGLESv2/renderer/RenderTarget9.cpp
+++ b/src/libGLESv2/renderer/RenderTarget9.cpp
@@ -45,7 +45,7 @@
if (supportedSamples == -1)
{
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
return;
}
@@ -69,7 +69,7 @@
if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
{
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
return;
}
diff --git a/src/libGLESv2/renderer/Renderer.cpp b/src/libGLESv2/renderer/Renderer.cpp
index 029b2ea..92efd3e 100644
--- a/src/libGLESv2/renderer/Renderer.cpp
+++ b/src/libGLESv2/renderer/Renderer.cpp
@@ -143,7 +143,7 @@
{
if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
{
- return error(GL_OUT_OF_MEMORY, (ID3DBlob*) NULL);
+ return gl::error(GL_OUT_OF_MEMORY, (ID3DBlob*) NULL);
}
infoLog.append("Warning: D3D shader compilation failed with ");
diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index 09889f4..f47f11a 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -535,7 +535,7 @@
{
ERR("Separate front/back stencil writemasks, reference values, or stencil mask values are "
"invalid under WebGL.");
- return error(GL_INVALID_OPERATION);
+ return gl::error(GL_INVALID_OPERATION);
}
ID3D11DepthStencilState *dxDepthStencilState = mStateCache.getDepthStencilState(depthStencilState);
@@ -663,7 +663,7 @@
// emulate fans via rewriting index buffer
case GL_TRIANGLE_FAN: primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST; break;
default:
- return error(GL_INVALID_ENUM, false);
+ return gl::error(GL_INVALID_ENUM, false);
}
mDeviceContext->IASetPrimitiveTopology(primitiveTopology);
@@ -914,7 +914,7 @@
mLineLoopIB = NULL;
ERR("Could not create a 32-bit looping index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -922,7 +922,7 @@
if (!mLineLoopIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_INT))
{
ERR("Could not reserve enough space in looping index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
void* mappedMemory = NULL;
@@ -930,7 +930,7 @@
if (offset == -1 || mappedMemory == NULL)
{
ERR("Could not map index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
unsigned int *data = reinterpret_cast<unsigned int*>(mappedMemory);
@@ -972,7 +972,7 @@
if (!mLineLoopIB->unmapBuffer())
{
ERR("Could not unmap index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
if (mAppliedIBSerial != mLineLoopIB->getSerial() || mAppliedIBOffset != indexBufferOffset)
@@ -1006,7 +1006,7 @@
mTriangleFanIB = NULL;
ERR("Could not create a scratch index buffer for GL_TRIANGLE_FAN.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -1015,7 +1015,7 @@
if (!mTriangleFanIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_INT))
{
ERR("Could not reserve enough space in scratch index buffer for GL_TRIANGLE_FAN.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
void* mappedMemory = NULL;
@@ -1023,7 +1023,7 @@
if (offset == -1 || mappedMemory == NULL)
{
ERR("Could not map scratch index buffer for GL_TRIANGLE_FAN.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
unsigned int *data = reinterpret_cast<unsigned int*>(mappedMemory);
@@ -1069,7 +1069,7 @@
if (!mTriangleFanIB->unmapBuffer())
{
ERR("Could not unmap scratch index buffer for GL_TRIANGLE_FAN.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
if (mAppliedIBSerial != mTriangleFanIB->getSerial() || mAppliedIBOffset != indexBufferOffset)
@@ -1781,6 +1781,8 @@
if (isLost)
{
// ensure we note the device loss --
+ // we'll probably get this done again by notifyDeviceLost
+ // but best to remember it!
// Note that we don't want to clear the device loss status here
// -- this needs to be done by resetDevice
mDeviceLost = true;
@@ -2160,21 +2162,21 @@
if (!colorbuffer)
{
ERR("Failed to retrieve the color buffer from the frame buffer.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
RenderTarget11 *sourceRenderTarget = RenderTarget11::makeRenderTarget11(colorbuffer->getRenderTarget());
if (!sourceRenderTarget)
{
ERR("Failed to retrieve the render target from the frame buffer.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
ID3D11ShaderResourceView *source = sourceRenderTarget->getShaderResourceView();
if (!source)
{
ERR("Failed to retrieve the render target view from the render target.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
TextureStorage11_2D *storage11 = TextureStorage11_2D::makeTextureStorage11_2D(storage->getStorageInstance());
@@ -2182,7 +2184,7 @@
{
source->Release();
ERR("Failed to retrieve the texture storage from the destination.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
RenderTarget11 *destRenderTarget = RenderTarget11::makeRenderTarget11(storage11->getRenderTarget(level));
@@ -2190,7 +2192,7 @@
{
source->Release();
ERR("Failed to retrieve the render target from the destination storage.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
ID3D11RenderTargetView *dest = destRenderTarget->getRenderTargetView();
@@ -2198,7 +2200,7 @@
{
source->Release();
ERR("Failed to retrieve the render target view from the destination render target.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
gl::Rectangle destRect;
@@ -2223,21 +2225,21 @@
if (!colorbuffer)
{
ERR("Failed to retrieve the color buffer from the frame buffer.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
RenderTarget11 *sourceRenderTarget = RenderTarget11::makeRenderTarget11(colorbuffer->getRenderTarget());
if (!sourceRenderTarget)
{
ERR("Failed to retrieve the render target from the frame buffer.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
ID3D11ShaderResourceView *source = sourceRenderTarget->getShaderResourceView();
if (!source)
{
ERR("Failed to retrieve the render target view from the render target.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
TextureStorage11_Cube *storage11 = TextureStorage11_Cube::makeTextureStorage11_Cube(storage->getStorageInstance());
@@ -2245,7 +2247,7 @@
{
source->Release();
ERR("Failed to retrieve the texture storage from the destination.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
RenderTarget11 *destRenderTarget = RenderTarget11::makeRenderTarget11(storage11->getRenderTarget(target, level));
@@ -2253,7 +2255,7 @@
{
source->Release();
ERR("Failed to retrieve the render target from the destination storage.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
ID3D11RenderTargetView *dest = destRenderTarget->getRenderTargetView();
@@ -2261,7 +2263,7 @@
{
source->Release();
ERR("Failed to retrieve the render target view from the destination render target.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
gl::Rectangle destRect;
@@ -2358,7 +2360,7 @@
destArea.x < 0 || destArea.x + destArea.width > static_cast<int>(destWidth) ||
destArea.y < 0 || destArea.y + destArea.height > static_cast<int>(destHeight))
{
- return error(GL_INVALID_VALUE, false);
+ return gl::error(GL_INVALID_VALUE, false);
}
// Set vertices
@@ -2367,7 +2369,7 @@
if (FAILED(result))
{
ERR("Failed to map vertex buffer for texture copy, HRESULT: 0x%X.", result);
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
d3d11::PositionTexCoordVertex *vertices = static_cast<d3d11::PositionTexCoordVertex*>(mappedResource.pData);
diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 930a15d..ea4cdba 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -955,7 +955,7 @@
depthStencilState.stencilMask != depthStencilState.stencilBackMask)
{
ERR("Separate front/back stencil writemasks, reference values, or stencil mask values are invalid under WebGL.");
- return error(GL_INVALID_OPERATION);
+ return gl::error(GL_INVALID_OPERATION);
}
// get the maximum size of the stencil ref
@@ -1149,7 +1149,7 @@
mPrimitiveCount = count - 2;
break;
default:
- return error(GL_INVALID_ENUM, false);
+ return gl::error(GL_INVALID_ENUM, false);
}
return mPrimitiveCount > 0;
@@ -1397,7 +1397,7 @@
else
{
ERR("Could not create a counting index buffer for glDrawArraysInstanced.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
else // Regular case
@@ -1447,7 +1447,7 @@
mLineLoopIB = NULL;
ERR("Could not create a 32-bit looping index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -1455,7 +1455,7 @@
if (!mLineLoopIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_INT))
{
ERR("Could not reserve enough space in looping index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
void* mappedMemory = NULL;
@@ -1463,7 +1463,7 @@
if (offset == -1 || mappedMemory == NULL)
{
ERR("Could not map index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
startIndex = static_cast<UINT>(offset) / 4;
@@ -1505,7 +1505,7 @@
if (!mLineLoopIB->unmapBuffer())
{
ERR("Could not unmap index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
else
@@ -1519,7 +1519,7 @@
mLineLoopIB = NULL;
ERR("Could not create a 16-bit looping index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -1527,7 +1527,7 @@
if (!mLineLoopIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_SHORT))
{
ERR("Could not reserve enough space in looping index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
void* mappedMemory = NULL;
@@ -1535,7 +1535,7 @@
if (offset == -1 || mappedMemory == NULL)
{
ERR("Could not map index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
startIndex = static_cast<UINT>(offset) / 2;
@@ -1577,7 +1577,7 @@
if (!mLineLoopIB->unmapBuffer())
{
ERR("Could not unmap index buffer for GL_LINE_LOOP.");
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -2048,6 +2048,8 @@
if (isLost)
{
// ensure we note the device loss --
+ // we'll probably get this done again by notifyDeviceLost
+ // but best to remember it!
// Note that we don't want to clear the device loss status here
// -- this needs to be done by resetDevice
mDeviceLost = true;
@@ -2547,7 +2549,7 @@
if (!readSurface || !drawSurface)
{
ERR("Failed to retrieve the render target.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
RECT srcRect, dstRect;
@@ -2614,7 +2616,7 @@
if (!readSurface || !drawSurface)
{
ERR("Failed to retrieve the render target.");
- return error(GL_OUT_OF_MEMORY, false);
+ return gl::error(GL_OUT_OF_MEMORY, false);
}
HRESULT result = mDevice->StretchRect(readSurface, NULL, drawSurface, NULL, D3DTEXF_NONE);
@@ -2662,7 +2664,7 @@
{
UNIMPLEMENTED(); // FIXME: Requires resolve using StretchRect into non-multisampled render target
surface->Release();
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
HRESULT result;
@@ -2690,7 +2692,7 @@
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
surface->Release();
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -2707,7 +2709,7 @@
if (d3d9::isDeviceLostError(result))
{
notifyDeviceLost();
- return error(GL_OUT_OF_MEMORY);
+ return gl::error(GL_OUT_OF_MEMORY);
}
else
{
diff --git a/src/libGLESv2/renderer/TextureStorage11.cpp b/src/libGLESv2/renderer/TextureStorage11.cpp
index bebd588..b75d94e 100644
--- a/src/libGLESv2/renderer/TextureStorage11.cpp
+++ b/src/libGLESv2/renderer/TextureStorage11.cpp
@@ -239,7 +239,7 @@
{
ASSERT(result == E_OUTOFMEMORY);
ERR("Creating image failed.");
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
}
else
{
@@ -298,7 +298,7 @@
if (result == E_OUTOFMEMORY)
{
- return error(GL_OUT_OF_MEMORY, static_cast<RenderTarget*>(NULL));
+ return gl::error(GL_OUT_OF_MEMORY, static_cast<RenderTarget*>(NULL));
}
ASSERT(SUCCEEDED(result));
@@ -314,7 +314,7 @@
if (result == E_OUTOFMEMORY)
{
rtv->Release();
- return error(GL_OUT_OF_MEMORY, static_cast<RenderTarget*>(NULL));
+ return gl::error(GL_OUT_OF_MEMORY, static_cast<RenderTarget*>(NULL));
}
ASSERT(SUCCEEDED(result));
@@ -352,7 +352,7 @@
if (result == E_OUTOFMEMORY)
{
- return error(GL_OUT_OF_MEMORY, static_cast<ID3D11ShaderResourceView*>(NULL));
+ return gl::error(GL_OUT_OF_MEMORY, static_cast<ID3D11ShaderResourceView*>(NULL));
}
ASSERT(SUCCEEDED(result));
}
@@ -414,7 +414,7 @@
{
ASSERT(result == E_OUTOFMEMORY);
ERR("Creating image failed.");
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
}
else
{
@@ -481,7 +481,7 @@
if (result == E_OUTOFMEMORY)
{
- return error(GL_OUT_OF_MEMORY, static_cast<RenderTarget*>(NULL));
+ return gl::error(GL_OUT_OF_MEMORY, static_cast<RenderTarget*>(NULL));
}
ASSERT(SUCCEEDED(result));
@@ -499,7 +499,7 @@
if (result == E_OUTOFMEMORY)
{
rtv->Release();
- return error(GL_OUT_OF_MEMORY, static_cast<RenderTarget*>(NULL));
+ return gl::error(GL_OUT_OF_MEMORY, static_cast<RenderTarget*>(NULL));
}
ASSERT(SUCCEEDED(result));
@@ -544,7 +544,7 @@
if (result == E_OUTOFMEMORY)
{
- return error(GL_OUT_OF_MEMORY, static_cast<ID3D11ShaderResourceView*>(NULL));
+ return gl::error(GL_OUT_OF_MEMORY, static_cast<ID3D11ShaderResourceView*>(NULL));
}
ASSERT(SUCCEEDED(result));
}
diff --git a/src/libGLESv2/renderer/TextureStorage9.cpp b/src/libGLESv2/renderer/TextureStorage9.cpp
index 6b9bd07..14a5e74 100644
--- a/src/libGLESv2/renderer/TextureStorage9.cpp
+++ b/src/libGLESv2/renderer/TextureStorage9.cpp
@@ -134,7 +134,7 @@
if (FAILED(result))
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
}
}
@@ -236,7 +236,7 @@
if (FAILED(result))
{
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
- error(GL_OUT_OF_MEMORY);
+ gl::error(GL_OUT_OF_MEMORY);
}
}