summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramVertex.cpp
diff options
context:
space:
mode:
author Alex Sakhartchouk <alexst@google.com> 2010-11-18 15:58:17 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-11-18 15:58:17 -0800
commita3326781352888ff80fcf920cf93fd738bb69e66 (patch)
tree91c55f677b294cad2ee7e078d4d820a7bea17598 /libs/rs/rsProgramVertex.cpp
parent04d93980ec2af55c04963a2b67f628d72ea7fe5f (diff)
parent67f2e442a31b8395e3c1951f8e91139ec7f2be99 (diff)
Merge "Support for cubemaps."
Diffstat (limited to 'libs/rs/rsProgramVertex.cpp')
-rw-r--r--libs/rs/rsProgramVertex.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/rs/rsProgramVertex.cpp b/libs/rs/rsProgramVertex.cpp
index e165967b70fe..3fd2981be0ba 100644
--- a/libs/rs/rsProgramVertex.cpp
+++ b/libs/rs/rsProgramVertex.cpp
@@ -253,16 +253,14 @@ void ProgramVertexState::init(Context *rsc) {
shaderString.append(" varTex0 = ATTRIB_texture0;\n");
shaderString.append("}\n");
- uint32_t tmp[6];
+ uint32_t tmp[4];
tmp[0] = RS_PROGRAM_PARAM_CONSTANT;
tmp[1] = (uint32_t)inputType;
tmp[2] = RS_PROGRAM_PARAM_INPUT;
tmp[3] = (uint32_t)attrElem;
- tmp[4] = RS_PROGRAM_PARAM_TEXTURE_COUNT;
- tmp[5] = 0;
ProgramVertex *pv = new ProgramVertex(rsc, shaderString.string(),
- shaderString.length(), tmp, 6);
+ shaderString.length(), tmp, 4);
Allocation *alloc = new Allocation(rsc, inputType);
pv->bindAllocation(rsc, alloc, 0);