diff options
Diffstat (limited to 'libs/rs/driver/rsdProgram.cpp')
| -rw-r--r-- | libs/rs/driver/rsdProgram.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/rs/driver/rsdProgram.cpp b/libs/rs/driver/rsdProgram.cpp index fa4cb0f..a96a5f9 100644 --- a/libs/rs/driver/rsdProgram.cpp +++ b/libs/rs/driver/rsdProgram.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 The Android Open Source Project + * Copyright (C) 2011-2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ bool rsdProgramVertexInit(const Context *rsc, const ProgramVertex *pv, textureNames, textureNamesCount, textureNamesLength); pv->mHal.drv = drv; - return drv->createShader(); + return true; } static void SyncProgramConstants(const Context *rsc, const Program *p) { @@ -71,10 +71,10 @@ void rsdProgramVertexDestroy(const Context *rsc, const ProgramVertex *pv) { if(pv->mHal.drv) { drv = (RsdShader*)pv->mHal.drv; if (rsc->props.mLogShaders) { - ALOGV("Destroying vertex shader with ID %u", drv->getShaderID()); + ALOGV("Destroying vertex shader with ID %u", (uint32_t)pv); } - if (drv->getShaderID()) { - dc->gl.shaderCache->cleanupVertex(drv->getShaderID()); + if (drv->getStateBasedIDCount()) { + dc->gl.shaderCache->cleanupVertex(drv); } delete drv; } @@ -88,7 +88,7 @@ bool rsdProgramFragmentInit(const Context *rsc, const ProgramFragment *pf, textureNames, textureNamesCount, textureNamesLength); pf->mHal.drv = drv; - return drv->createShader(); + return true; } void rsdProgramFragmentSetActive(const Context *rsc, const ProgramFragment *pf) { @@ -105,10 +105,10 @@ void rsdProgramFragmentDestroy(const Context *rsc, const ProgramFragment *pf) { if(pf->mHal.drv) { drv = (RsdShader*)pf->mHal.drv; if (rsc->props.mLogShaders) { - ALOGV("Destroying fragment shader with ID %u", drv->getShaderID()); + ALOGV("Destroying fragment shader with ID %u", (uint32_t)pf); } - if (drv->getShaderID()) { - dc->gl.shaderCache->cleanupFragment(drv->getShaderID()); + if (drv->getStateBasedIDCount()) { + dc->gl.shaderCache->cleanupFragment(drv); } delete drv; } |