diff options
| author | Jason Sams <rjsams@android.com> | 2011-05-03 15:01:58 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2011-05-03 17:27:26 -0700 |
| commit | 2698536b3ff60bfee85e47e4a8d4b25fdfdf4db5 (patch) | |
| tree | 9deee58d4f07e697fbef0cb78384c3e509cd3d07 /libs/rs | |
| parent | e98c27e5e4f450b294cc525e1de65a194e9904d2 (diff) | |
| download | frameworks_base-2698536b3ff60bfee85e47e4a8d4b25fdfdf4db5.zip frameworks_base-2698536b3ff60bfee85e47e4a8d4b25fdfdf4db5.tar.gz frameworks_base-2698536b3ff60bfee85e47e4a8d4b25fdfdf4db5.tar.bz2 | |
Fix error checks on compute context creation.
Remove GL init for compute scripts.
Change-Id: I1bce8e4112babf4345fa56a30a9bed753734d8d6
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/rsContext.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 6d63f67..e2e14f2 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -270,17 +270,18 @@ void * Context::threadProc(void *vrsc) { rsc->props.mLogVisual = getProp("debug.rs.visual"); if (!rsdHalInit(rsc, 0, 0)) { + rsc->setError(RS_ERROR_FATAL_DRIVER, "Failed initializing GL"); LOGE("Hal init failed"); return NULL; } rsc->mHal.funcs.setPriority(rsc, rsc->mThreadPriority); - if (!rsc->initGLThread()) { - rsc->setError(RS_ERROR_OUT_OF_MEMORY, "Failed initializing GL"); - return NULL; - } - if (rsc->mIsGraphicsContext) { + if (!rsc->initGLThread()) { + rsc->setError(RS_ERROR_OUT_OF_MEMORY, "Failed initializing GL"); + return NULL; + } + rsc->mStateRaster.init(rsc); rsc->setProgramRaster(NULL); rsc->mStateVertex.init(rsc); |