summaryrefslogtreecommitdiff
path: root/src/mesa/main/es_generator.py
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-04-24 16:22:02 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-04-27 19:28:11 -0400
commit003433989597771bbb4f03cf678f5771c09606fd (patch)
treedd28a3e1cd3ca7e9ec632f669d3924a0ffd546fb /src/mesa/main/es_generator.py
parent61d94dd207459e0c42d98c9d6eb7df5eabdfd8a4 (diff)
es: Prefix the get* functions with _es1/2 so they don't conflict
Diffstat (limited to 'src/mesa/main/es_generator.py')
-rw-r--r--src/mesa/main/es_generator.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py
index 1282a1c4f5..8f08a3a6f9 100644
--- a/src/mesa/main/es_generator.py
+++ b/src/mesa/main/es_generator.py
@@ -293,6 +293,7 @@ for funcName in keys:
passthroughFuncName = ""
passthroughDeclarationString = ""
passthroughCallString = ""
+ prefixOverride = None
variables = []
conversionCodeOutgoing = []
conversionCodeIncoming = []
@@ -311,6 +312,9 @@ for funcName in keys:
funcPrefix = "_es_"
aliasprefix = apiutil.AliasPrefix(funcName)
alias = apiutil.ConversionFunction(funcName)
+ prefixOverride = apiutil.FunctionPrefix(funcName)
+ if prefixOverride != "_mesa_":
+ aliasprefix = apiutil.FunctionPrefix(funcName)
if not alias:
# There may still be a Mesa alias for the function
if apiutil.Alias(funcName):