Skip to content

A
angle
Commit 74ba76c4 by Jamie Madill
Options

Move rx::MemoryBuffer to common library.

This class is not D3D-specific so can be shared among other back-ends, or other parts of the ANGLE codebase. Change-Id: Ie00760eb5dae4db52e465ee7a2f97789bae8c0b0 Reviewed-on: https://chromium-review.googlesource.com/246500Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 811b6352
Showing with 22 additions and 22 deletions
src/libANGLE/renderer/d3d/MemoryBuffer.cpp → src/common/MemoryBuffer.cpp
...@@ -4,12 +4,13 @@ ...@@ -4,12 +4,13 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#include "libANGLE/renderer/d3d/MemoryBuffer.h" #include "common/MemoryBuffer.h"
#include "common/debug.h"
#include <algorithm> #include <algorithm>
#include <cstdlib> #include <cstdlib>
#include "common/debug.h"
namespace rx namespace rx
{ {
......
src/libANGLE/renderer/d3d/MemoryBuffer.h → src/common/MemoryBuffer.h
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#ifndef LIBANGLE_RENDERER_D3D_MEMORYBUFFER_H_ #ifndef COMMON_MEMORYBUFFER_H_
#define LIBANGLE_RENDERER_D3D_MEMORYBUFFER_H_ #define COMMON_MEMORYBUFFER_H_
#include "common/angleutils.h" #include "common/angleutils.h"
...@@ -37,4 +37,4 @@ class MemoryBuffer ...@@ -37,4 +37,4 @@ class MemoryBuffer
} }
#endif // LIBANGLE_RENDERER_D3D_MEMORYBUFFER_H_ #endif // COMMON_MEMORYBUFFER_H_
src/libANGLE/renderer/d3d/RendererD3D.cpp
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "libANGLE/renderer/d3d/RendererD3D.h" #include "libANGLE/renderer/d3d/RendererD3D.h"
#include "common/MemoryBuffer.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
#include "libANGLE/Framebuffer.h" #include "libANGLE/Framebuffer.h"
...@@ -18,7 +19,6 @@ ...@@ -18,7 +19,6 @@
#include "libANGLE/formatutils.h" #include "libANGLE/formatutils.h"
#include "libANGLE/renderer/d3d/DisplayD3D.h" #include "libANGLE/renderer/d3d/DisplayD3D.h"
#include "libANGLE/renderer/d3d/IndexDataManager.h" #include "libANGLE/renderer/d3d/IndexDataManager.h"
#include "libANGLE/renderer/d3d/MemoryBuffer.h"
namespace rx namespace rx
{ {
......
src/libANGLE/renderer/d3d/RendererD3D.h
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
#ifndef LIBANGLE_RENDERER_D3D_RENDERERD3D_H_ #ifndef LIBANGLE_RENDERER_D3D_RENDERERD3D_H_
#define LIBANGLE_RENDERER_D3D_RENDERERD3D_H_ #define LIBANGLE_RENDERER_D3D_RENDERERD3D_H_
#include "common/MemoryBuffer.h"
#include "libANGLE/Data.h" #include "libANGLE/Data.h"
#include "libANGLE/renderer/Renderer.h" #include "libANGLE/renderer/Renderer.h"
#include "libANGLE/renderer/d3d/formatutilsD3D.h" #include "libANGLE/renderer/d3d/formatutilsD3D.h"
#include "libANGLE/renderer/d3d/MemoryBuffer.h"
#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h" #include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
//FIXME(jmadill): std::array is currently prohibited by Chromium style guide //FIXME(jmadill): std::array is currently prohibited by Chromium style guide
......
src/libANGLE/renderer/d3d/d3d11/Buffer11.h
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#ifndef LIBANGLE_RENDERER_D3D_D3D11_BUFFER11_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D11_BUFFER11_H_
#define LIBANGLE_RENDERER_D3D_D3D11_BUFFER11_H_ #define LIBANGLE_RENDERER_D3D_D3D11_BUFFER11_H_
#include "libANGLE/renderer/d3d/BufferD3D.h" #include "common/MemoryBuffer.h"
#include "libANGLE/renderer/d3d/MemoryBuffer.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/renderer/d3d/BufferD3D.h"
namespace rx namespace rx
{ {
......
src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
...@@ -11,19 +11,18 @@ ...@@ -11,19 +11,18 @@
#include <tuple> #include <tuple>
#include "common/MemoryBuffer.h"
#include "common/utilities.h"
#include "libANGLE/ImageIndex.h"
#include "libANGLE/formatutils.h" #include "libANGLE/formatutils.h"
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h" #include "libANGLE/renderer/d3d/TextureD3D.h"
#include "libANGLE/renderer/d3d/d3d11/Blit11.h"
#include "libANGLE/renderer/d3d/d3d11/Image11.h"
#include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h" #include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
#include "libANGLE/renderer/d3d/d3d11/SwapChain11.h" #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h"
#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
#include "libANGLE/renderer/d3d/d3d11/Blit11.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h" #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include "libANGLE/renderer/d3d/d3d11/Image11.h" #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
#include "libANGLE/renderer/d3d/MemoryBuffer.h"
#include "libANGLE/renderer/d3d/TextureD3D.h"
#include "libANGLE/ImageIndex.h"
#include "common/utilities.h"
namespace rx namespace rx
{ {
......
src/libANGLE/renderer/d3d/d3d9/Buffer9.h
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#ifndef LIBANGLE_RENDERER_D3D_D3D9_BUFFER9_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D9_BUFFER9_H_
#define LIBANGLE_RENDERER_D3D_D3D9_BUFFER9_H_ #define LIBANGLE_RENDERER_D3D_D3D9_BUFFER9_H_
#include "libANGLE/renderer/d3d/BufferD3D.h" #include "common/MemoryBuffer.h"
#include "libANGLE/renderer/d3d/MemoryBuffer.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/renderer/d3d/BufferD3D.h"
namespace rx namespace rx
{ {
......
src/libGLESv2.gypi
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
# These file lists are shared with the GN build. # These file lists are shared with the GN build.
'libangle_common_sources': 'libangle_common_sources':
[ [
'common/MemoryBuffer.cpp',
'common/MemoryBuffer.h',
'common/angleutils.cpp', 'common/angleutils.cpp',
'common/angleutils.h', 'common/angleutils.h',
'common/debug.cpp', 'common/debug.cpp',
...@@ -174,8 +176,6 @@ ...@@ -174,8 +176,6 @@
'libANGLE/renderer/d3d/loadimage.h', 'libANGLE/renderer/d3d/loadimage.h',
'libANGLE/renderer/d3d/loadimage.inl', 'libANGLE/renderer/d3d/loadimage.inl',
'libANGLE/renderer/d3d/loadimageSSE2.cpp', 'libANGLE/renderer/d3d/loadimageSSE2.cpp',
'libANGLE/renderer/d3d/MemoryBuffer.cpp',
'libANGLE/renderer/d3d/MemoryBuffer.h',
'libANGLE/renderer/d3d/ProgramD3D.cpp', 'libANGLE/renderer/d3d/ProgramD3D.cpp',
'libANGLE/renderer/d3d/ProgramD3D.h', 'libANGLE/renderer/d3d/ProgramD3D.h',
'libANGLE/renderer/d3d/RenderbufferD3D.cpp', 'libANGLE/renderer/d3d/RenderbufferD3D.cpp',
......
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