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

Commit 111c178b authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "RenderScript should not depend on libsurfaceflinger_client.so"

parents 7356b0b0 88b55fb0

libs/rs/rsContext.cpp

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

#include <ui/FramebufferNativeWindow.h>

#include <ui/EGLUtils.h>

#include <surfaceflinger/Surface.h>

#include <ui/egl/android_natives.h>



#include <sys/types.h>

#include <sys/resource.h>
@@ -461,7 +461,7 @@ Context::~Context() 
    objDestroyOOBDestroy();

}



void Context::setSurface(uint32_t w, uint32_t h, Surface *sur)

void Context::setSurface(uint32_t w, uint32_t h, android_native_window_t *sur)

{

    rsAssert(mIsGraphicsContext);
@@ -859,7 +859,7 @@ void rsi_ContextResume(Context *rsc) 


void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, void *sur)

{

    rsc->setSurface(w, h, (Surface *)sur);

    rsc->setSurface(w, h, (android_native_window_t *)sur);

}



void rsi_ContextSetPriority(Context *rsc, int32_t p)

libs/rs/rsContext.h

+3 −4
Original line number Diff line number Diff line
@@ -41,12 +41,11 @@ 
#include "rsgApiStructs.h"

#include "rsLocklessFifo.h"



#include <ui/egl/android_natives.h>



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

namespace android {



class Surface;



namespace renderscript {



class Context
@@ -99,7 +98,7 @@ public: 


    void pause();

    void resume();

    void setSurface(uint32_t w, uint32_t h, Surface *sur);

    void setSurface(uint32_t w, uint32_t h, android_native_window_t *sur);

    void setPriority(int32_t p);



    void assignName(ObjectBase *obj, const char *name, uint32_t len);
@@ -239,7 +238,7 @@ private: 


    static void * threadProc(void *);



    Surface *mWndSurface;

    android_native_window_t *mWndSurface;



    Vector<ObjectBase *> mNames;