am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"

* commit 'fd6a3ff4b4dda34f8e6e03989dd7466e4cbd8b0e':
  GLES_trace: fix compile errors on 64 bit architectures
This commit is contained in:
Siva Velusamy 2014-02-04 19:19:38 +00:00 committed by Android Git Automerger
commit 67041e6841
2 changed files with 640 additions and 638 deletions

File diff suppressed because it is too large Load Diff

View File

@ -25,9 +25,9 @@
# To generate C++ files, this script uses the 'pyratemp' template # To generate C++ files, this script uses the 'pyratemp' template
# module. The only reason to use pyratemp is that it is extremly # module. The only reason to use pyratemp is that it is extremly
# simple to install: # simple to install:
# $ wget http://www.simple-is-better.org/template/pyratemp-current/pyratemp.py # $ wget http://www.simple-is-better.org/template/pyratemp-0.3.2.tgz
# Put the file in the GLES_trace/tools folder, or update PYTHONPATH # Extract and put the pyratemp.py file in the GLES_trace/tools folder,
# to point to wherever it was downloaded. # or update PYTHONPATH to point to wherever it was downloaded.
# #
# USAGE # USAGE
# $ cd GLES_trace - run the program from GLES2_trace folder # $ cd GLES_trace - run the program from GLES2_trace folder
@ -44,16 +44,18 @@ class DataType:
self.name = name self.name = name
def __str__(self): def __str__(self):
if self.name == "pointer": # pointers map to the INT DataType if self.name == "pointer": # pointers map to the INT64 DataType
return "INT" return "INT64"
return self.name.upper() return self.name.upper()
def getProtobufCall(self): def getProtobufCall(self):
if self.name == "void": if self.name == "void":
raise ValueError("Attempt to set void value") raise ValueError("Attempt to set void value")
elif self.name == "char" or self.name == "byte" \ elif self.name == "char" or self.name == "byte" \
or self.name == "pointer" or self.name == "enum": or self.name == "enum":
return "add_intvalue((int)" return "add_intvalue((int)"
elif self.name == "pointer":
return "add_int64value((uintptr_t)"
elif self.name == "int": elif self.name == "int":
return "add_intvalue(" return "add_intvalue("
elif self.name == "float": elif self.name == "float":