summaryrefslogtreecommitdiff
path: root/rsScriptC_LibGL.cpp
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2010-09-23 16:16:33 -0700
committerAlex Sakhartchouk <alexst@google.com>2010-09-23 16:16:33 -0700
commit383e5b1f68c321a77bfd7466fa1171a9bfab4a6f (patch)
tree90cbcb717584d9ec474803b0742a32ccb8c57c08 /rsScriptC_LibGL.cpp
parentb9077f48e2c5aff1838bbbeccf56c2b5f5490ab6 (diff)
downloadrs-383e5b1f68c321a77bfd7466fa1171a9bfab4a6f.tar.gz
Adding support for all allowed textures.
Cleaning up unused code Adding error messages Change-Id: I3a92476738ff7699d49feeafcd3eee6f70621acb
Diffstat (limited to 'rsScriptC_LibGL.cpp')
-rw-r--r--rsScriptC_LibGL.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/rsScriptC_LibGL.cpp b/rsScriptC_LibGL.cpp
index 2f8f79a9..4be50593 100644
--- a/rsScriptC_LibGL.cpp
+++ b/rsScriptC_LibGL.cpp
@@ -93,33 +93,33 @@ static void SC_bindProgramRaster(RsProgramRaster pv)
static void SC_vpLoadProjectionMatrix(const rsc_Matrix *m)
{
GET_TLS();
- rsc->getVertex()->setProjectionMatrix(m);
+ rsc->getVertex()->setProjectionMatrix(rsc, m);
}
static void SC_vpLoadModelMatrix(const rsc_Matrix *m)
{
GET_TLS();
- rsc->getVertex()->setModelviewMatrix(m);
+ rsc->getVertex()->setModelviewMatrix(rsc, m);
}
static void SC_vpLoadTextureMatrix(const rsc_Matrix *m)
{
GET_TLS();
- rsc->getVertex()->setTextureMatrix(m);
+ rsc->getVertex()->setTextureMatrix(rsc, m);
}
static void SC_pfConstantColor(RsProgramFragment vpf, float r, float g, float b, float a)
{
- //GET_TLS();
+ GET_TLS();
ProgramFragment *pf = static_cast<ProgramFragment *>(vpf);
- pf->setConstantColor(r, g, b, a);
+ pf->setConstantColor(rsc, r, g, b, a);
}
static void SC_vpGetProjectionMatrix(rsc_Matrix *m)
{
GET_TLS();
- rsc->getVertex()->getProjectionMatrix(m);
+ rsc->getVertex()->getProjectionMatrix(rsc, m);
}
@@ -280,7 +280,7 @@ static void SC_color(float r, float g, float b, float a)
{
GET_TLS();
ProgramFragment *pf = (ProgramFragment *)rsc->getFragment();
- pf->setConstantColor(r, g, b, a);
+ pf->setConstantColor(rsc, r, g, b, a);
}
static void SC_uploadToTexture2(RsAllocation va, uint32_t baseMipLevel)