diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-04-24 16:22:02 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-04-27 19:28:11 -0400 |
| commit | 003433989597771bbb4f03cf678f5771c09606fd (patch) | |
| tree | dd28a3e1cd3ca7e9ec632f669d3924a0ffd546fb /src/mesa/es | |
| parent | 61d94dd207459e0c42d98c9d6eb7df5eabdfd8a4 (diff) | |
es: Prefix the get* functions with _es1/2 so they don't conflict
Diffstat (limited to 'src/mesa/es')
| -rw-r--r-- | src/mesa/es/main/get_gen.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/mesa/es/main/get_gen.py b/src/mesa/es/main/get_gen.py index b820157be0..5fadfee841 100644 --- a/src/mesa/es/main/get_gen.py +++ b/src/mesa/es/main/get_gen.py @@ -565,7 +565,7 @@ def ConversionFunc(fromType, toType): return fromStr + "_TO_" + toStr -def EmitGetFunction(stateVars, returnType): +def EmitGetFunction(stateVars, returnType, API): """Emit the code to implement glGetBooleanv, glGetIntegerv or glGetFloatv.""" assert (returnType == GLboolean or returnType == GLint or @@ -575,13 +575,13 @@ def EmitGetFunction(stateVars, returnType): strType = TypeStrings[returnType] # Capitalize first letter of return type if returnType == GLint: - function = "_mesa_GetIntegerv" + function = "_es%d_GetIntegerv" % API elif returnType == GLboolean: - function = "_mesa_GetBooleanv" + function = "_es%d_GetBooleanv" % API elif returnType == GLfloat: - function = "_mesa_GetFloatv" + function = "_es%d_GetFloatv" % API elif returnType == GLfixed: - function = "_mesa_GetFixedv" + function = "_es%d_GetFixedv" % API else: abort() @@ -773,20 +773,17 @@ static GLenum compressed_formats[] = { #define ARRAY_SIZE(A) (sizeof(A) / sizeof(A[0])) -void GLAPIENTRY -_mesa_GetFixedv( GLenum pname, GLfixed *params ); - """ return def EmitAll(stateVars, API): EmitHeader() - EmitGetFunction(stateVars, GLboolean) - EmitGetFunction(stateVars, GLfloat) - EmitGetFunction(stateVars, GLint) + EmitGetFunction(stateVars, GLboolean, API) + EmitGetFunction(stateVars, GLfloat, API) + EmitGetFunction(stateVars, GLint, API) if API == 1: - EmitGetFunction(stateVars, GLfixed) + EmitGetFunction(stateVars, GLfixed, API) def main(args): |