commit 1d8c8dba995a43e39d7c1f2b1aac92cf69c56c52
author Nicolas Capens <capn@google.com> Mon Nov 05 16:30:42 2018 -0500
committer Nicolas Capens <nicolascapens@google.com> Tue Nov 06 17:37:45 2018 +0000
tree b73f5c068992bc378ce070fe1e6951537f6742d4
parent 4169b31090dbe7d48b3e053c571c12414089bf28

Fix include paths.

Bug b/117152542

Change-Id: I341f03ad3fcc8d52723ec9575685eeb28519e7dc
Reviewed-on: https://swiftshader-review.googlesource.com/c/22328
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/WSI/FrameBuffer.cpp

diff --git a/src/WSI/FrameBuffer.cpp b/src/WSI/FrameBuffer.cpp
index 7a8ddc1..01838fe 100644
--- a/src/WSI/FrameBuffer.cpp
+++ b/src/WSI/FrameBuffer.cpp
@@ -14,10 +14,10 @@
 
 #include "FrameBuffer.hpp"
 
-#include "Renderer/Surface.hpp"
+#include "Device/Surface.hpp"
 #include "Reactor/Reactor.hpp"
-#include "Common/Timer.hpp"
-#include "Common/Debug.hpp"
+#include "System/Timer.hpp"
+#include "System/Debug.hpp"
 
 #include <stdio.h>
 #include <string.h>

src/WSI/FrameBuffer.hpp

diff --git a/src/WSI/FrameBuffer.hpp b/src/WSI/FrameBuffer.hpp
index f07feb3..7ce1d17 100644
--- a/src/WSI/FrameBuffer.hpp
+++ b/src/WSI/FrameBuffer.hpp
@@ -16,8 +16,8 @@
 #define	sw_FrameBuffer_hpp
 
 #include "Reactor/Reactor.hpp"
-#include "Renderer/Surface.hpp"
-#include "Common/Thread.hpp"
+#include "Device/Surface.hpp"
+#include "System/Thread.hpp"
 
 namespace sw
 {

src/WSI/FrameBufferAndroid.cpp

diff --git a/src/WSI/FrameBufferAndroid.cpp b/src/WSI/FrameBufferAndroid.cpp
index 0ae5f09..8bc114e 100644
--- a/src/WSI/FrameBufferAndroid.cpp
+++ b/src/WSI/FrameBufferAndroid.cpp
@@ -14,7 +14,7 @@
 
 #include "FrameBufferAndroid.hpp"
 
-#include "Common/GrallocAndroid.hpp"
+#include "System/GrallocAndroid.hpp"
 
 #include <system/window.h>
 

src/WSI/FrameBufferAndroid.hpp

diff --git a/src/WSI/FrameBufferAndroid.hpp b/src/WSI/FrameBufferAndroid.hpp
index b71c32b..fd6a016 100644
--- a/src/WSI/FrameBufferAndroid.hpp
+++ b/src/WSI/FrameBufferAndroid.hpp
@@ -15,8 +15,8 @@
 #ifndef sw_FrameBufferAndroid_hpp
 #define sw_FrameBufferAndroid_hpp
 
-#include "Main/FrameBuffer.hpp"
-#include "Common/Debug.hpp"
+#include "WSI/FrameBuffer.hpp"
+#include "System/Debug.hpp"
 
 struct ANativeWindow;
 struct ANativeWindowBuffer;

src/WSI/FrameBufferDD.cpp

diff --git a/src/WSI/FrameBufferDD.cpp b/src/WSI/FrameBufferDD.cpp
index 46ed89f..9625a13 100644
--- a/src/WSI/FrameBufferDD.cpp
+++ b/src/WSI/FrameBufferDD.cpp
@@ -14,7 +14,7 @@
 
 #include "FrameBufferDD.hpp"
 
-#include "Common/Debug.hpp"
+#include "System/Debug.hpp"
 
 namespace sw
 {

src/WSI/FrameBufferGDI.cpp

diff --git a/src/WSI/FrameBufferGDI.cpp b/src/WSI/FrameBufferGDI.cpp
index 90a469e..5c80bd7 100644
--- a/src/WSI/FrameBufferGDI.cpp
+++ b/src/WSI/FrameBufferGDI.cpp
@@ -14,7 +14,7 @@
 
 #include "FrameBufferGDI.hpp"
 
-#include "Common/Debug.hpp"
+#include "System/Debug.hpp"
 
 namespace sw
 {

src/WSI/FrameBufferOSX.hpp

diff --git a/src/WSI/FrameBufferOSX.hpp b/src/WSI/FrameBufferOSX.hpp
index 07f8d63..85a2621 100644
--- a/src/WSI/FrameBufferOSX.hpp
+++ b/src/WSI/FrameBufferOSX.hpp
@@ -15,7 +15,7 @@
 #ifndef sw_FrameBufferOSX_hpp
 #define sw_FrameBufferOSX_hpp
 
-#include "Main/FrameBuffer.hpp"
+#include "WSI/FrameBuffer.hpp"
 
 #import <Cocoa/Cocoa.h>
 

src/WSI/FrameBufferOSX.mm

diff --git a/src/WSI/FrameBufferOSX.mm b/src/WSI/FrameBufferOSX.mm
index 6d58ae7..0403a54 100644
--- a/src/WSI/FrameBufferOSX.mm
+++ b/src/WSI/FrameBufferOSX.mm
@@ -14,7 +14,7 @@
 
 #include "FrameBufferOSX.hpp"
 
-#include "Common/Debug.hpp"
+#include "System/Debug.hpp"
 
 #include <EGL/egl.h>
 #import <QuartzCore/QuartzCore.h>

src/WSI/FrameBufferOzone.hpp

diff --git a/src/WSI/FrameBufferOzone.hpp b/src/WSI/FrameBufferOzone.hpp
index 0dc9f60..1f253fa 100644
--- a/src/WSI/FrameBufferOzone.hpp
+++ b/src/WSI/FrameBufferOzone.hpp
@@ -15,7 +15,7 @@
 #ifndef sw_FrameBufferOzone_hpp
 #define sw_FrameBufferOzone_hpp
 
-#include "Main/FrameBuffer.hpp"
+#include "WSI/FrameBuffer.hpp"
 
 namespace sw
 {

src/WSI/FrameBufferWin.cpp

diff --git a/src/WSI/FrameBufferWin.cpp b/src/WSI/FrameBufferWin.cpp
index cad8954..e23487a 100644
--- a/src/WSI/FrameBufferWin.cpp
+++ b/src/WSI/FrameBufferWin.cpp
@@ -53,7 +53,7 @@
 
 #include "FrameBufferDD.hpp"
 #include "FrameBufferGDI.hpp"
-#include "Common/Configurator.hpp"
+#include "System/Configurator.hpp"
 
 sw::FrameBufferWin *createFrameBufferWin(HWND windowHandle, int width, int height, bool fullscreen, bool topLeftOrigin)
 {

src/WSI/FrameBufferX11.cpp

diff --git a/src/WSI/FrameBufferX11.cpp b/src/WSI/FrameBufferX11.cpp
index b3ae3b4..aa9f38e 100644
--- a/src/WSI/FrameBufferX11.cpp
+++ b/src/WSI/FrameBufferX11.cpp
@@ -15,7 +15,7 @@
 #include "FrameBufferX11.hpp"
 
 #include "libX11.hpp"
-#include "Common/Timer.hpp"
+#include "System/Timer.hpp"
 
 #include <sys/ipc.h>
 #include <sys/shm.h>

src/WSI/FrameBufferX11.hpp

diff --git a/src/WSI/FrameBufferX11.hpp b/src/WSI/FrameBufferX11.hpp
index dc96331..d40bed9 100644
--- a/src/WSI/FrameBufferX11.hpp
+++ b/src/WSI/FrameBufferX11.hpp
@@ -15,8 +15,8 @@
 #ifndef sw_FrameBufferX11_hpp
 #define sw_FrameBufferX11_hpp
 
-#include "Main/FrameBuffer.hpp"
-#include "Common/Debug.hpp"
+#include "WSI/FrameBuffer.hpp"
+#include "System/Debug.hpp"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

src/WSI/libX11.cpp

diff --git a/src/WSI/libX11.cpp b/src/WSI/libX11.cpp
index f3723ff..5cca9f8 100644
--- a/src/WSI/libX11.cpp
+++ b/src/WSI/libX11.cpp
@@ -14,7 +14,7 @@
 
 #include "libX11.hpp"
 
-#include "Common/SharedLibrary.hpp"
+#include "System/SharedLibrary.hpp"
 
 #define Bool int