Skip to content

S
swiftshader
Commit 9cb01cfc by Nicolas Capens Committed by Nicolas Capens
Options

Refactor Android includes.

Forward declare ANativeWindow, and remove <hardware/gralloc.h> where GrallocAndroid.hpp already includes it. Change-Id: Idebd4c40280960ff00cd51b6633c1c84a8cf7de2 Reviewed-on: https://swiftshader-review.googlesource.com/11288Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 4dd1eff4
Showing with 3 additions and 3 deletions
src/Main/FrameBufferAndroid.cpp
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "FrameBufferAndroid.hpp" #include "FrameBufferAndroid.hpp"
#include "GrallocAndroid.hpp" #include "GrallocAndroid.hpp"
#include <system/window.h>
#include <cutils/log.h> #include <cutils/log.h>
namespace sw namespace sw
......
src/Main/FrameBufferAndroid.hpp
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
#include "Main/FrameBuffer.hpp" #include "Main/FrameBuffer.hpp"
#include "Common/Debug.hpp" #include "Common/Debug.hpp"
#include <hardware/gralloc.h> struct ANativeWindow;
#include <system/window.h> struct ANativeWindowBuffer;
namespace sw namespace sw
{ {
......
src/OpenGL/common/Image.hpp
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#if defined(__ANDROID__) #if defined(__ANDROID__)
#include <hardware/gralloc.h>
#include <system/window.h> #include <system/window.h>
#include "../../Common/GrallocAndroid.hpp" #include "../../Common/GrallocAndroid.hpp"
#include "../../Common/DebugAndroid.hpp" #include "../../Common/DebugAndroid.hpp"
......
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