summaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2011-05-17 12:32:47 -0700
committerAlex Sakhartchouk <alexst@google.com>2011-05-17 16:42:24 -0700
commit7257c7ee4b66f00c43d9235f3ac600061ae79968 (patch)
tree7fff637943c3249cfab87bfe1a3b9b8f055eb45d /driver
parent58f74bdb53a950a2ec4851d473a231614a3979bf (diff)
downloadandroid_frameworks_rs-7257c7ee4b66f00c43d9235f3ac600061ae79968.tar.gz
android_frameworks_rs-7257c7ee4b66f00c43d9235f3ac600061ae79968.tar.bz2
android_frameworks_rs-7257c7ee4b66f00c43d9235f3ac600061ae79968.zip
Preparing libRS for for compilation on host.
Change-Id: I851add79831331c8a8b20dcccdb0817f8ad0c359
Diffstat (limited to 'driver')
-rw-r--r--driver/rsdGL.cpp4
-rw-r--r--driver/rsdGL.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/driver/rsdGL.cpp b/driver/rsdGL.cpp
index de9fb51f..a70589b5 100644
--- a/driver/rsdGL.cpp
+++ b/driver/rsdGL.cpp
@@ -300,7 +300,7 @@ bool rsdGLInit(const Context *rsc) {
}
-bool rsdGLSetSurface(const Context *rsc, uint32_t w, uint32_t h, ANativeWindow *sur) {
+bool rsdGLSetSurface(const Context *rsc, uint32_t w, uint32_t h, RsNativeWindow sur) {
RsdHal *dc = (RsdHal *)rsc->mHal.drv;
EGLBoolean ret;
@@ -319,7 +319,7 @@ bool rsdGLSetSurface(const Context *rsc, uint32_t w, uint32_t h, ANativeWindow *
dc->gl.height = 1;
}
- dc->gl.wndSurface = sur;
+ dc->gl.wndSurface = (ANativeWindow *)sur;
if (dc->gl.wndSurface != NULL) {
dc->gl.width = w;
dc->gl.height = h;
diff --git a/driver/rsdGL.h b/driver/rsdGL.h
index 90cbe04e..01c84384 100644
--- a/driver/rsdGL.h
+++ b/driver/rsdGL.h
@@ -18,6 +18,7 @@
#define RSD_GL_H
#include <rs_hal.h>
+#include <EGL/egl.h>
class RsdShaderCache;
class RsdVertexArrayState;
@@ -74,7 +75,7 @@ typedef struct RsdGLRec {
bool rsdGLInit(const android::renderscript::Context *rsc);
void rsdGLShutdown(const android::renderscript::Context *rsc);
bool rsdGLSetSurface(const android::renderscript::Context *rsc,
- uint32_t w, uint32_t h, ANativeWindow *sur);
+ uint32_t w, uint32_t h, RsNativeWindow sur);
void rsdGLSwap(const android::renderscript::Context *rsc);
void rsdGLCheckError(const android::renderscript::Context *rsc,
const char *msg, bool isFatal = false);