Skip to content

A
angle
Commit 4d16f6d8 by Jamie Madill
Options

Replace NULL with nullptr in Framebuffer9/11.

BUG=angleproject:963 Change-Id: I1ba418e7540b9c3ac6611aa3e4f0c1ca27557a1a Reviewed-on: https://chromium-review.googlesource.com/267734Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 7d75e2b7
Showing with 15 additions and 15 deletions
src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
...@@ -43,7 +43,7 @@ static gl::Error InvalidateAttachmentSwizzles(const gl::FramebufferAttachment *a ...@@ -43,7 +43,7 @@ static gl::Error InvalidateAttachmentSwizzles(const gl::FramebufferAttachment *a
TextureD3D *textureD3D = GetImplAs<TextureD3D>(texture); TextureD3D *textureD3D = GetImplAs<TextureD3D>(texture);
TextureStorage *texStorage = NULL; TextureStorage *texStorage = nullptr;
gl::Error error = textureD3D->getNativeTexture(&texStorage); gl::Error error = textureD3D->getNativeTexture(&texStorage);
if (error.isError()) if (error.isError())
{ {
...@@ -114,7 +114,7 @@ static gl::Error getRenderTargetResource(const gl::FramebufferAttachment *colorb ...@@ -114,7 +114,7 @@ static gl::Error getRenderTargetResource(const gl::FramebufferAttachment *colorb
{ {
ASSERT(colorbuffer); ASSERT(colorbuffer);
RenderTarget11 *renderTarget = NULL; RenderTarget11 *renderTarget = nullptr;
gl::Error error = d3d11::GetAttachmentRenderTarget(colorbuffer, &renderTarget); gl::Error error = d3d11::GetAttachmentRenderTarget(colorbuffer, &renderTarget);
if (error.isError()) if (error.isError())
{ {
...@@ -137,7 +137,7 @@ static gl::Error getRenderTargetResource(const gl::FramebufferAttachment *colorb ...@@ -137,7 +137,7 @@ static gl::Error getRenderTargetResource(const gl::FramebufferAttachment *colorb
gl::Error Framebuffer11::readPixels(const gl::Rectangle &area, GLenum format, GLenum type, size_t outputPitch, const gl::PixelPackState &pack, uint8_t *pixels) const gl::Error Framebuffer11::readPixels(const gl::Rectangle &area, GLenum format, GLenum type, size_t outputPitch, const gl::PixelPackState &pack, uint8_t *pixels) const
{ {
ID3D11Texture2D *colorBufferTexture = NULL; ID3D11Texture2D *colorBufferTexture = nullptr;
unsigned int subresourceIndex = 0; unsigned int subresourceIndex = 0;
const gl::FramebufferAttachment *colorbuffer = mData.getReadAttachment(); const gl::FramebufferAttachment *colorbuffer = mData.getReadAttachment();
...@@ -150,7 +150,7 @@ gl::Error Framebuffer11::readPixels(const gl::Rectangle &area, GLenum format, GL ...@@ -150,7 +150,7 @@ gl::Error Framebuffer11::readPixels(const gl::Rectangle &area, GLenum format, GL
} }
gl::Buffer *packBuffer = pack.pixelBuffer.get(); gl::Buffer *packBuffer = pack.pixelBuffer.get();
if (packBuffer != NULL) if (packBuffer != nullptr)
{ {
Buffer11 *packBufferStorage = GetImplAs<Buffer11>(packBuffer); Buffer11 *packBufferStorage = GetImplAs<Buffer11>(packBuffer);
PackPixelsParams packParams(area, format, type, outputPitch, pack, reinterpret_cast<ptrdiff_t>(pixels)); PackPixelsParams packParams(area, format, type, outputPitch, pack, reinterpret_cast<ptrdiff_t>(pixels));
...@@ -229,7 +229,7 @@ gl::Error Framebuffer11::blit(const gl::Rectangle &sourceArea, const gl::Rectang ...@@ -229,7 +229,7 @@ gl::Error Framebuffer11::blit(const gl::Rectangle &sourceArea, const gl::Rectang
const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getDepthOrStencilbuffer(); const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getDepthOrStencilbuffer();
ASSERT(readBuffer); ASSERT(readBuffer);
RenderTargetD3D *readRenderTarget = NULL; RenderTargetD3D *readRenderTarget = nullptr;
gl::Error error = GetAttachmentRenderTarget(readBuffer, &readRenderTarget); gl::Error error = GetAttachmentRenderTarget(readBuffer, &readRenderTarget);
if (error.isError()) if (error.isError())
{ {
...@@ -240,7 +240,7 @@ gl::Error Framebuffer11::blit(const gl::Rectangle &sourceArea, const gl::Rectang ...@@ -240,7 +240,7 @@ gl::Error Framebuffer11::blit(const gl::Rectangle &sourceArea, const gl::Rectang
const gl::FramebufferAttachment *drawBuffer = mData.getDepthOrStencilAttachment(); const gl::FramebufferAttachment *drawBuffer = mData.getDepthOrStencilAttachment();
ASSERT(drawBuffer); ASSERT(drawBuffer);
RenderTargetD3D *drawRenderTarget = NULL; RenderTargetD3D *drawRenderTarget = nullptr;
error = GetAttachmentRenderTarget(drawBuffer, &drawRenderTarget); error = GetAttachmentRenderTarget(drawBuffer, &drawRenderTarget);
if (error.isError()) if (error.isError())
{ {
......
src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
...@@ -54,12 +54,12 @@ gl::Error Framebuffer9::clear(const gl::State &state, const ClearParameters &cle ...@@ -54,12 +54,12 @@ gl::Error Framebuffer9::clear(const gl::State &state, const ClearParameters &cle
gl::Error Framebuffer9::readPixels(const gl::Rectangle &area, GLenum format, GLenum type, size_t outputPitch, const gl::PixelPackState &pack, uint8_t *pixels) const gl::Error Framebuffer9::readPixels(const gl::Rectangle &area, GLenum format, GLenum type, size_t outputPitch, const gl::PixelPackState &pack, uint8_t *pixels) const
{ {
ASSERT(pack.pixelBuffer.get() == NULL); ASSERT(pack.pixelBuffer.get() == nullptr);
const gl::FramebufferAttachment *colorbuffer = mData.getColorAttachment(0); const gl::FramebufferAttachment *colorbuffer = mData.getColorAttachment(0);
ASSERT(colorbuffer); ASSERT(colorbuffer);
RenderTarget9 *renderTarget = NULL; RenderTarget9 *renderTarget = nullptr;
gl::Error error = d3d9::GetAttachmentRenderTarget(colorbuffer, &renderTarget); gl::Error error = d3d9::GetAttachmentRenderTarget(colorbuffer, &renderTarget);
if (error.isError()) if (error.isError())
{ {
...@@ -84,7 +84,7 @@ gl::Error Framebuffer9::readPixels(const gl::Rectangle &area, GLenum format, GLe ...@@ -84,7 +84,7 @@ gl::Error Framebuffer9::readPixels(const gl::Rectangle &area, GLenum format, GLe
ASSERT(device); ASSERT(device);
HRESULT result; HRESULT result;
IDirect3DSurface9 *systemSurface = NULL; IDirect3DSurface9 *systemSurface = nullptr;
bool directToPixels = !pack.reverseRowOrder && pack.alignment <= 4 && mRenderer->getShareHandleSupport() && bool directToPixels = !pack.reverseRowOrder && pack.alignment <= 4 && mRenderer->getShareHandleSupport() &&
area.x == 0 && area.y == 0 && area.x == 0 && area.y == 0 &&
static_cast<UINT>(area.width) == desc.Width && static_cast<UINT>(area.height) == desc.Height && static_cast<UINT>(area.width) == desc.Width && static_cast<UINT>(area.height) == desc.Height &&
...@@ -104,7 +104,7 @@ gl::Error Framebuffer9::readPixels(const gl::Rectangle &area, GLenum format, GLe ...@@ -104,7 +104,7 @@ gl::Error Framebuffer9::readPixels(const gl::Rectangle &area, GLenum format, GLe
if (!directToPixels) if (!directToPixels)
{ {
result = device->CreateOffscreenPlainSurface(desc.Width, desc.Height, desc.Format, result = device->CreateOffscreenPlainSurface(desc.Width, desc.Height, desc.Format,
D3DPOOL_SYSTEMMEM, &systemSurface, NULL); D3DPOOL_SYSTEMMEM, &systemSurface, nullptr);
if (FAILED(result)) if (FAILED(result))
{ {
ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY); ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
...@@ -246,7 +246,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl ...@@ -246,7 +246,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl
const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getColorbuffer(0); const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getColorbuffer(0);
ASSERT(readBuffer); ASSERT(readBuffer);
RenderTarget9 *readRenderTarget = NULL; RenderTarget9 *readRenderTarget = nullptr;
gl::Error error = d3d9::GetAttachmentRenderTarget(readBuffer, &readRenderTarget); gl::Error error = d3d9::GetAttachmentRenderTarget(readBuffer, &readRenderTarget);
if (error.isError()) if (error.isError())
{ {
...@@ -257,7 +257,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl ...@@ -257,7 +257,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl
const gl::FramebufferAttachment *drawBuffer = mData.getColorAttachment(0); const gl::FramebufferAttachment *drawBuffer = mData.getColorAttachment(0);
ASSERT(drawBuffer); ASSERT(drawBuffer);
RenderTarget9 *drawRenderTarget = NULL; RenderTarget9 *drawRenderTarget = nullptr;
error = d3d9::GetAttachmentRenderTarget(drawBuffer, &drawRenderTarget); error = d3d9::GetAttachmentRenderTarget(drawBuffer, &drawRenderTarget);
if (error.isError()) if (error.isError())
{ {
...@@ -372,7 +372,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl ...@@ -372,7 +372,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl
const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getDepthOrStencilbuffer(); const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getDepthOrStencilbuffer();
ASSERT(readBuffer); ASSERT(readBuffer);
RenderTarget9 *readDepthStencil = NULL; RenderTarget9 *readDepthStencil = nullptr;
gl::Error error = d3d9::GetAttachmentRenderTarget(readBuffer, &readDepthStencil); gl::Error error = d3d9::GetAttachmentRenderTarget(readBuffer, &readDepthStencil);
if (error.isError()) if (error.isError())
{ {
...@@ -383,7 +383,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl ...@@ -383,7 +383,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl
const gl::FramebufferAttachment *drawBuffer = mData.getDepthOrStencilAttachment(); const gl::FramebufferAttachment *drawBuffer = mData.getDepthOrStencilAttachment();
ASSERT(drawBuffer); ASSERT(drawBuffer);
RenderTarget9 *drawDepthStencil = NULL; RenderTarget9 *drawDepthStencil = nullptr;
error = d3d9::GetAttachmentRenderTarget(drawBuffer, &drawDepthStencil); error = d3d9::GetAttachmentRenderTarget(drawBuffer, &drawDepthStencil);
if (error.isError()) if (error.isError())
{ {
...@@ -398,7 +398,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl ...@@ -398,7 +398,7 @@ gl::Error Framebuffer9::blit(const gl::Rectangle &sourceArea, const gl::Rectangl
IDirect3DSurface9* drawSurface = drawDepthStencil->getSurface(); IDirect3DSurface9* drawSurface = drawDepthStencil->getSurface();
ASSERT(drawDepthStencil); ASSERT(drawDepthStencil);
HRESULT result = device->StretchRect(readSurface, NULL, drawSurface, NULL, D3DTEXF_NONE); HRESULT result = device->StretchRect(readSurface, nullptr, drawSurface, nullptr, D3DTEXF_NONE);
SafeRelease(readSurface); SafeRelease(readSurface);
SafeRelease(drawSurface); SafeRelease(drawSurface);
......
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