diff options
author | José Fonseca <jfonseca@vmware.com> | 2015-01-08 23:45:43 +0000 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2015-01-08 23:46:25 +0000 |
commit | 34ea6163f9f0e0122fb0bb03607eccdca31ced7a (patch) | |
tree | 086a5e82b4083b1f723d62f7f5c85b5bf2125e4b | |
parent | ef5d837b06c473b4e7139a6e13550cfd602aba88 (diff) |
gltrace: Fix PBO unpacking on core contexts.6.1
gltrace::PROFILE_COMPAT was a misnomer -- it actually meant desktop
profile. So b0c597293060329afc1ee10d4062d30a2b272f78 broke PBO for core
contexts.
-rw-r--r-- | helpers/glprofile.hpp | 4 | ||||
-rw-r--r-- | wrappers/gltrace.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/helpers/glprofile.hpp b/helpers/glprofile.hpp index 7e81b756..5915e897 100644 --- a/helpers/glprofile.hpp +++ b/helpers/glprofile.hpp @@ -60,8 +60,8 @@ struct Profile { } inline bool - compat(void) { - return api == API_GL && !core; + desktop(void) { + return api == API_GL; } inline bool diff --git a/wrappers/gltrace.py b/wrappers/gltrace.py index c342bf14..770b2857 100644 --- a/wrappers/gltrace.py +++ b/wrappers/gltrace.py @@ -159,7 +159,7 @@ class GlTracer(Tracer): for camelcase_name, uppercase_name in self.arrays: # in which profile is the array available? - profile_check = 'profile.compat()' + profile_check = 'profile.desktop()' if camelcase_name in self.arrays_es1: profile_check = '(' + profile_check + ' || es1)'; @@ -291,7 +291,7 @@ class GlTracer(Tracer): print 'static inline bool' print 'can_unpack_subimage(void) {' print ' gltrace::Context *ctx = gltrace::getContext();' - print ' return ctx->profile.compat();' + print ' return ctx->profile.desktop();' print '}' print @@ -907,7 +907,7 @@ class GlTracer(Tracer): print ' {' print ' gltrace::Context *ctx = gltrace::getContext();' print ' GLint _unpack_buffer = 0;' - print ' if (ctx->profile.compat())' + print ' if (ctx->profile.desktop())' print ' _glGetIntegerv(GL_PIXEL_UNPACK_BUFFER_BINDING, &_unpack_buffer);' print ' if (_unpack_buffer) {' print ' trace::localWriter.writePointer((uintptr_t)%s);' % arg.name @@ -956,7 +956,7 @@ class GlTracer(Tracer): for camelcase_name, uppercase_name in self.arrays: # in which profile is the array available? - profile_check = 'profile.compat()' + profile_check = 'profile.desktop()' if camelcase_name in self.arrays_es1: profile_check = '(' + profile_check + ' || es1)'; @@ -1099,7 +1099,7 @@ class GlTracer(Tracer): if uppercase_name == 'TEXTURE_COORD': print ' GLint client_active_texture = _glGetInteger(GL_CLIENT_ACTIVE_TEXTURE);' print ' GLint max_texture_coords = 0;' - print ' if (ctx->profile.compat())' + print ' if (ctx->profile.desktop())' print ' _glGetIntegerv(GL_MAX_TEXTURE_COORDS, &max_texture_coords);' print ' else' print ' _glGetIntegerv(GL_MAX_TEXTURE_UNITS, &max_texture_coords);' |