From d081fffab58b4cb8a36b7a083ab7793585bc1510 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Thu, 16 Sep 2010 18:18:29 -0700 Subject: Cleanup GL setup code and remove legacy 1.1 paths. Reset pointers to NULL when allocations are unbound. Change-Id: Ifaba634ecbb154970b7fb47faa8e6475d16d2f66 --- libs/rs/rsContext.cpp | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'libs/rs/rsContext.cpp') diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 5327aac..3dbdbfb 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -232,23 +232,15 @@ void Context::timerPrint() bool Context::setupCheck() { - if (checkVersion2_0()) { - if (!mShaderCache.lookup(this, mVertex.get(), mFragment.get())) { - LOGE("Context::setupCheck() 1 fail"); - return false; - } - - mFragmentStore->setupGL2(this, &mStateFragmentStore); - mFragment->setupGL2(this, &mStateFragment, &mShaderCache); - mRaster->setupGL2(this, &mStateRaster); - mVertex->setupGL2(this, &mStateVertex, &mShaderCache); - - } else { - mFragmentStore->setupGL(this, &mStateFragmentStore); - mFragment->setupGL(this, &mStateFragment); - mRaster->setupGL(this, &mStateRaster); - mVertex->setupGL(this, &mStateVertex); + if (!mShaderCache.lookup(this, mVertex.get(), mFragment.get())) { + LOGE("Context::setupCheck() 1 fail"); + return false; } + + mFragmentStore->setupGL2(this, &mStateFragmentStore); + mFragment->setupGL2(this, &mStateFragment, &mShaderCache); + mRaster->setupGL2(this, &mStateRaster); + mVertex->setupGL2(this, &mStateVertex, &mShaderCache); return true; } @@ -940,6 +932,7 @@ RsContext rsContextCreateGL(RsDevice vdev, uint32_t version, bool useDepth) LOGV("rsContextCreateGL %p, %i", vdev, useDepth); Device * dev = static_cast(vdev); Context *rsc = new Context(dev, true, useDepth); + LOGV("rsContextCreateGL ret %p ", rsc); return rsc; } -- cgit v1.1