commit a3f154324ae74bc8db8c7751e3c83b6be342eace
author Alex Sakhartchouk <alexst@google.com> Mon Feb 13 11:57:32 2012 -0800
committer Alex Sakhartchouk <alexst@google.com> Tue Feb 14 16:00:22 2012 -0800
tree 6f2169dc63a77f396c931e2228cd73b11b99168e
parent c43a97935bb52dc06df39c9590b74e11bb2f1ca5

Fixing uint32 size_t mismatches.

Change-Id: I5263158f5855472db6317a52c209fe4e273f3368

libs/rs/driver/rsdAllocation.cpp

diff --git a/libs/rs/driver/rsdAllocation.cpp b/libs/rs/driver/rsdAllocation.cpp
index ea92192..53e0e48 100644
--- a/libs/rs/driver/rsdAllocation.cpp
+++ b/libs/rs/driver/rsdAllocation.cpp
@@ -388,7 +388,7 @@
 
 void rsdAllocationData1D(const Context *rsc, const Allocation *alloc,
                          uint32_t xoff, uint32_t lod, uint32_t count,
-                         const void *data, uint32_t sizeBytes) {
+                         const void *data, size_t sizeBytes) {
     DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
 
     const uint32_t eSize = alloc->mHal.state.type->getElementSizeBytes();
@@ -407,7 +407,7 @@
 
 void rsdAllocationData2D(const Context *rsc, const Allocation *alloc,
                          uint32_t xoff, uint32_t yoff, uint32_t lod, RsAllocationCubemapFace face,
-                         uint32_t w, uint32_t h, const void *data, uint32_t sizeBytes) {
+                         uint32_t w, uint32_t h, const void *data, size_t sizeBytes) {
     DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
 
     uint32_t eSize = alloc->mHal.state.elementSizeBytes;

libs/rs/driver/rsdProgram.cpp

diff --git a/libs/rs/driver/rsdProgram.cpp b/libs/rs/driver/rsdProgram.cpp
index 54484df..852b6bf 100644
--- a/libs/rs/driver/rsdProgram.cpp
+++ b/libs/rs/driver/rsdProgram.cpp
@@ -34,7 +34,7 @@
 using namespace android::renderscript;
 
 bool rsdProgramVertexInit(const Context *rsc, const ProgramVertex *pv,
-                          const char* shader, uint32_t shaderLen) {
+                          const char* shader, size_t shaderLen) {
     RsdShader *drv = new RsdShader(pv, GL_VERTEX_SHADER, shader, shaderLen);
     pv->mHal.drv = drv;
 
@@ -78,7 +78,7 @@
 }
 
 bool rsdProgramFragmentInit(const Context *rsc, const ProgramFragment *pf,
-                          const char* shader, uint32_t shaderLen) {
+                          const char* shader, size_t shaderLen) {
     RsdShader *drv = new RsdShader(pf, GL_FRAGMENT_SHADER, shader, shaderLen);
     pf->mHal.drv = drv;
 

libs/rs/driver/rsdShader.cpp

diff --git a/libs/rs/driver/rsdShader.cpp b/libs/rs/driver/rsdShader.cpp
index 3bca794..0e5b388 100644
--- a/libs/rs/driver/rsdShader.cpp
+++ b/libs/rs/driver/rsdShader.cpp
@@ -30,7 +30,7 @@
 using namespace android::renderscript;
 
 RsdShader::RsdShader(const Program *p, uint32_t type,
-                       const char * shaderText, uint32_t shaderLength) {
+                       const char * shaderText, size_t shaderLength) {
 
     mUserShader.setTo(shaderText, shaderLength);
     mRSProgram = p;

libs/rs/rs_hal.h

diff --git a/libs/rs/rs_hal.h b/libs/rs/rs_hal.h
index 1e222e1..7c9618a 100644
--- a/libs/rs/rs_hal.h
+++ b/libs/rs/rs_hal.h
@@ -119,15 +119,15 @@
 
         void (*data1D)(const Context *rsc, const Allocation *alloc,
                        uint32_t xoff, uint32_t lod, uint32_t count,
-                       const void *data, uint32_t sizeBytes);
+                       const void *data, size_t sizeBytes);
         void (*data2D)(const Context *rsc, const Allocation *alloc,
                        uint32_t xoff, uint32_t yoff, uint32_t lod,
                        RsAllocationCubemapFace face, uint32_t w, uint32_t h,
-                       const void *data, uint32_t sizeBytes);
+                       const void *data, size_t sizeBytes);
         void (*data3D)(const Context *rsc, const Allocation *alloc,
                        uint32_t xoff, uint32_t yoff, uint32_t zoff,
                        uint32_t lod, RsAllocationCubemapFace face,
-                       uint32_t w, uint32_t h, uint32_t d, const void *data, uint32_t sizeBytes);
+                       uint32_t w, uint32_t h, uint32_t d, const void *data, size_t sizeBytes);
 
         // Allocation to allocation copies
         void (*allocData1D)(const Context *rsc,
@@ -151,9 +151,9 @@
                             uint32_t srcLod, RsAllocationCubemapFace srcFace);
 
         void (*elementData1D)(const Context *rsc, const Allocation *alloc, uint32_t x,
-                              const void *data, uint32_t elementOff, uint32_t sizeBytes);
+                              const void *data, uint32_t elementOff, size_t sizeBytes);
         void (*elementData2D)(const Context *rsc, const Allocation *alloc, uint32_t x, uint32_t y,
-                              const void *data, uint32_t elementOff, uint32_t sizeBytes);
+                              const void *data, uint32_t elementOff, size_t sizeBytes);
 
 
     } allocation;
@@ -172,14 +172,14 @@
 
     struct {
         bool (*init)(const Context *rsc, const ProgramVertex *pv,
-                     const char* shader, uint32_t shaderLen);
+                     const char* shader, size_t shaderLen);
         void (*setActive)(const Context *rsc, const ProgramVertex *pv);
         void (*destroy)(const Context *rsc, const ProgramVertex *pv);
     } vertex;
 
     struct {
         bool (*init)(const Context *rsc, const ProgramFragment *pf,
-                     const char* shader, uint32_t shaderLen);
+                     const char* shader, size_t shaderLen);
         void (*setActive)(const Context *rsc, const ProgramFragment *pf);
         void (*destroy)(const Context *rsc, const ProgramFragment *pf);
     } fragment;