Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b962e57 authored by Jason Sams's avatar Jason Sams
Browse files

Cleanup includes so Log.h can use the tag. rsUtils.h is the file that should... 

Cleanup includes so Log.h can use the tag.  rsUtils.h is the file that should be included everywhere and contain rs global defines.
parent bba134c8

libs/rs/jni/RenderScript_jni.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <math.h>

#include <math.h>





#include <utils/misc.h>

#include <utils/misc.h>

#include <utils/Log.h>





#include <ui/EGLNativeWindowSurface.h>

#include <ui/EGLNativeWindowSurface.h>

#include <ui/Surface.h>

#include <ui/Surface.h>

libs/rs/rsAllocation.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,9 @@ 




#include "rsContext.h"

#include "rsContext.h"





#include <GLES/gl.h>

#include <GLES/glext.h>



using namespace android;

using namespace android;

using namespace android::renderscript;

using namespace android::renderscript;

libs/rs/rsComponent.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -17,11 +17,7 @@ 
#ifndef ANDROID_RS_STRUCTURED_COMPONENT_H

#ifndef ANDROID_RS_STRUCTURED_COMPONENT_H

#define ANDROID_RS_STRUCTURED_COMPONENT_H

#define ANDROID_RS_STRUCTURED_COMPONENT_H





#include <stdint.h>

#include "rsUtils.h"

#include <sys/types.h>

#include <stdlib.h>



#include "RenderScript.h"

#include "rsObjectBase.h"

#include "rsObjectBase.h"





// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

libs/rs/rsContext.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,9 @@ 
#include "rsThreadIO.h"

#include "rsThreadIO.h"

#include "utils/String8.h"

#include "utils/String8.h"





#include <GLES/gl.h>

#include <GLES/glext.h>



using namespace android;

using namespace android;

using namespace android::renderscript;

using namespace android::renderscript;

libs/rs/rsContext.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -17,10 +17,6 @@ 
#ifndef ANDROID_RS_CONTEXT_H

#ifndef ANDROID_RS_CONTEXT_H

#define ANDROID_RS_CONTEXT_H

#define ANDROID_RS_CONTEXT_H





#include <utils/Vector.h>

#include <ui/EGLNativeWindowSurface.h>

#include <ui/Surface.h>



#include "rsType.h"

#include "rsType.h"

#include "rsMatrix.h"

#include "rsMatrix.h"

#include "rsAllocation.h"

#include "rsAllocation.h"
@@ -38,6 +34,10 @@ 
#include "rsgApiStructs.h"

#include "rsgApiStructs.h"

#include "rsLocklessFifo.h"

#include "rsLocklessFifo.h"





#include <ui/EGLNativeWindowSurface.h>

#include <ui/Surface.h>









// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

namespace android {

namespace android {