commit 8f615d682f9e7e2cd4de2e4478e0e76fc359922c
author Stephen Hines <srhines@google.com> Fri Dec 20 12:23:32 2013 -0800
committer Stephen Hines <srhines@google.com> Fri Dec 20 12:25:55 2013 -0800
tree 088fc2833b64c436cebd99a8b8447b7739737483
parent 504eb4a5e37a6feb2dbe0bcd0db9f965d8d2d426

Replace "mips" with "mipmaps" since the MIPS gcc compiler defines mips to 1.

Change-Id: Ia48ffa714ff9e3a2e3b64ea1edd11ad0f6bf354a

cpp/Allocation.cpp

diff --git a/cpp/Allocation.cpp b/cpp/Allocation.cpp
index c8e7182..00d207e 100644
--- a/cpp/Allocation.cpp
+++ b/cpp/Allocation.cpp
@@ -313,10 +313,10 @@
 
 
 sp<Allocation> Allocation::createTyped(sp<RS> rs, sp<const Type> type,
-                                    RsAllocationMipmapControl mips, uint32_t usage) {
+                                    RsAllocationMipmapControl mipmaps, uint32_t usage) {
     void *id = 0;
     if (rs->getError() == RS_SUCCESS) {
-        id = RS::dispatch->AllocationCreateTyped(rs->getContext(), type->getID(), mips, usage, 0);
+        id = RS::dispatch->AllocationCreateTyped(rs->getContext(), type->getID(), mipmaps, usage, 0);
     }
     if (id == 0) {
         rs->throwError(RS_ERROR_RUNTIME_ERROR, "Allocation creation failed");
@@ -326,11 +326,11 @@
 }
 
 sp<Allocation> Allocation::createTyped(sp<RS> rs, sp<const Type> type,
-                                    RsAllocationMipmapControl mips, uint32_t usage,
+                                    RsAllocationMipmapControl mipmaps, uint32_t usage,
                                     void *pointer) {
     void *id = 0;
     if (rs->getError() == RS_SUCCESS) {
-        id = RS::dispatch->AllocationCreateTyped(rs->getContext(), type->getID(), mips, usage,
+        id = RS::dispatch->AllocationCreateTyped(rs->getContext(), type->getID(), mipmaps, usage,
                                                  (uintptr_t)pointer);
     }
     if (id == 0) {

cpp/rsCppStructs.h

diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index 0df201b..70931be 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -505,25 +505,25 @@
      * Creates an Allocation for use by scripts with a given Type.
      * @param[in] rs Context to which the Allocation will belong
      * @param[in] type Type of the Allocation
-     * @param[in] mips desired mipmap behavior for the Allocation
+     * @param[in] mipmaps desired mipmap behavior for the Allocation
      * @param[in] usage usage for the Allocation
      * @return new Allocation
      */
     static sp<Allocation> createTyped(sp<RS> rs, sp<const Type> type,
-                                   RsAllocationMipmapControl mips, uint32_t usage);
+                                   RsAllocationMipmapControl mipmaps, uint32_t usage);
 
     /**
      * Creates an Allocation for use by scripts with a given Type and a backing pointer. For use
      * with RS_ALLOCATION_USAGE_SHARED.
      * @param[in] rs Context to which the Allocation will belong
      * @param[in] type Type of the Allocation
-     * @param[in] mips desired mipmap behavior for the Allocation
+     * @param[in] mipmaps desired mipmap behavior for the Allocation
      * @param[in] usage usage for the Allocation
      * @param[in] pointer existing backing store to use for this Allocation if possible
      * @return new Allocation
      */
     static sp<Allocation> createTyped(sp<RS> rs, sp<const Type> type,
-                                   RsAllocationMipmapControl mips, uint32_t usage, void * pointer);
+                                   RsAllocationMipmapControl mipmaps, uint32_t usage, void * pointer);
 
     /**
      * Creates an Allocation for use by scripts with a given Type with no mipmaps.