diff options
Diffstat (limited to 'libs/rs/driver/rsdShader.h')
-rw-r--r-- | libs/rs/driver/rsdShader.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/rs/driver/rsdShader.h b/libs/rs/driver/rsdShader.h index e32145f..6c0b616 100644 --- a/libs/rs/driver/rsdShader.h +++ b/libs/rs/driver/rsdShader.h @@ -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. @@ -81,15 +81,12 @@ protected: void appendAttributes(); void appendTextures(); - void createTexturesString(const char** textureNames, size_t textureNamesCount, - const size_t *textureNamesLength); void initAttribAndUniformArray(); mutable bool mDirty; android::String8 mShader; android::String8 mUserShader; - android::String8 mShaderTextures; uint32_t mShaderID; uint32_t mType; @@ -101,6 +98,8 @@ protected: android::String8 *mUniformNames; uint32_t *mUniformArraySizes; + android::Vector<android::String8> mTextureNames; + int32_t mTextureUniformIndexStart; void logUniform(const android::renderscript::Element *field, |