Skip to content

A
angle
Commit 41ebb808 by Geoff Lang
Options

Move imageformats to the d3d folder.

BUG=angle:681 Change-Id: I83f0e5aaca4aaa84e5868afcde4f27eba011d5f1 Reviewed-on: https://chromium-review.googlesource.com/238479Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent c2ca196e
Showing with 7 additions and 7 deletions
src/libANGLE/formatutils.cpp
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Framebuffer.h" #include "libANGLE/Framebuffer.h"
#include "libANGLE/renderer/Renderer.h" #include "libANGLE/renderer/Renderer.h"
#include "libANGLE/renderer/imageformats.h" #include "libANGLE/renderer/d3d/imageformats.h"
#include "libANGLE/renderer/d3d/copyimage.h" #include "libANGLE/renderer/d3d/copyimage.h"
namespace gl namespace gl
......
src/libANGLE/renderer/d3d/generatemip.h
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef LIBANGLE_RENDERER_D3D_GENERATEMIP_H_ #ifndef LIBANGLE_RENDERER_D3D_GENERATEMIP_H_
#define LIBANGLE_RENDERER_D3D_GENERATEMIP_H_ #define LIBANGLE_RENDERER_D3D_GENERATEMIP_H_
#include "libANGLE/renderer/imageformats.h" #include "libANGLE/renderer/d3d/imageformats.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
namespace rx namespace rx
......
src/libANGLE/renderer/imageformats.h → src/libANGLE/renderer/d3d/imageformats.h
// //
// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2013-2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
// imageformats.h: Defines image format types with functions for mip generation // imageformats.h: Defines image format types with functions for mip generation
// and copying. // and copying.
#ifndef LIBANGLE_RENDERER_IMAGEFORMATS_H_ #ifndef LIBANGLE_RENDERER_D3D_IMAGEFORMATS_H_
#define LIBANGLE_RENDERER_IMAGEFORMATS_H_ #define LIBANGLE_RENDERER_D3D_IMAGEFORMATS_H_
#include "common/mathutil.h" #include "common/mathutil.h"
...@@ -2026,4 +2026,4 @@ struct R11G11B10F ...@@ -2026,4 +2026,4 @@ struct R11G11B10F
} }
#endif // LIBANGLE_RENDERER_IMAGEFORMATS_H_ #endif // LIBANGLE_RENDERER_D3D_IMAGEFORMATS_H_
src/libGLESv2.gypi
...@@ -129,7 +129,6 @@ ...@@ -129,7 +129,6 @@
'libANGLE/renderer/TransformFeedbackImpl.h', 'libANGLE/renderer/TransformFeedbackImpl.h',
'libANGLE/renderer/VertexArrayImpl.h', 'libANGLE/renderer/VertexArrayImpl.h',
'libANGLE/renderer/Workarounds.h', 'libANGLE/renderer/Workarounds.h',
'libANGLE/renderer/imageformats.h',
'libANGLE/validationES.cpp', 'libANGLE/validationES.cpp',
'libANGLE/validationES.h', 'libANGLE/validationES.h',
'libANGLE/validationES2.cpp', 'libANGLE/validationES2.cpp',
...@@ -160,6 +159,7 @@ ...@@ -160,6 +159,7 @@
'libANGLE/renderer/d3d/HLSLCompiler.h', 'libANGLE/renderer/d3d/HLSLCompiler.h',
'libANGLE/renderer/d3d/ImageD3D.cpp', 'libANGLE/renderer/d3d/ImageD3D.cpp',
'libANGLE/renderer/d3d/ImageD3D.h', 'libANGLE/renderer/d3d/ImageD3D.h',
'libANGLE/renderer/d3d/imageformats.h',
'libANGLE/renderer/d3d/IndexBuffer.cpp', 'libANGLE/renderer/d3d/IndexBuffer.cpp',
'libANGLE/renderer/d3d/IndexBuffer.h', 'libANGLE/renderer/d3d/IndexBuffer.h',
'libANGLE/renderer/d3d/IndexDataManager.cpp', 'libANGLE/renderer/d3d/IndexDataManager.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