diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2016-04-04 13:36:12 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2016-04-04 13:36:12 +0100 |
| commit | 9ed6462ab512e967a7f7a1350f9eaaf74105c24d (patch) | |
| tree | 24a7fec83a37ae78ba44f603f4b7ef52883e08d0 /wrappers | |
| parent | 55a270c4471eac51174a749857eef9db6371b1e8 (diff) | |
helpers: rename glprofile to glfeatures.
This module will have more than just description of OpenGL profiles, but
actual features.
Diffstat (limited to 'wrappers')
| -rw-r--r-- | wrappers/egltrace.py | 4 | ||||
| -rw-r--r-- | wrappers/glcaps.cpp | 4 | ||||
| -rw-r--r-- | wrappers/gltrace.hpp | 6 | ||||
| -rw-r--r-- | wrappers/gltrace.py | 4 | ||||
| -rw-r--r-- | wrappers/gltrace_state.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/wrappers/egltrace.py b/wrappers/egltrace.py index abd3bfcc..333809b9 100644 --- a/wrappers/egltrace.py +++ b/wrappers/egltrace.py @@ -64,11 +64,11 @@ class EglTracer(GlTracer): print r' EGLint api = EGL_OPENGL_ES_API;' print r' _eglQueryContext(dpy, ctx, EGL_CONTEXT_CLIENT_TYPE, &api);' print r' if (api == EGL_OPENGL_API) {' - print r' assert(tr->profile.api == glprofile::API_GL);' + print r' assert(tr->profile.api == glfeatures::API_GL);' print r' } else if (api == EGL_OPENGL_ES_API) {' print r' EGLint client_version = 1;' print r' _eglQueryContext(dpy, ctx, EGL_CONTEXT_CLIENT_VERSION, &client_version);' - print r' if (tr->profile.api != glprofile::API_GLES ||' + print r' if (tr->profile.api != glfeatures::API_GLES ||' print r' tr->profile.major < client_version) {' print r' std::string version = tr->profile.str();' print r' os::log("apitrace: warning: eglMakeCurrent: expected OpenGL ES %i.x context, but got %s\n",' diff --git a/wrappers/glcaps.cpp b/wrappers/glcaps.cpp index 85a76a87..e680fdd9 100644 --- a/wrappers/glcaps.cpp +++ b/wrappers/glcaps.cpp @@ -101,9 +101,9 @@ const struct ExtensionsDesc * getExtraExtensions(const Context *ctx) { switch (ctx->profile.api) { - case glprofile::API_GL: + case glfeatures::API_GL: return &extraExtensionsFull; - case glprofile::API_GLES: + case glfeatures::API_GLES: return &extraExtensionsES; default: assert(0); diff --git a/wrappers/gltrace.hpp b/wrappers/gltrace.hpp index 5b4a4f44..7e05ad69 100644 --- a/wrappers/gltrace.hpp +++ b/wrappers/gltrace.hpp @@ -32,7 +32,7 @@ #include "glimports.hpp" -#include "glprofile.hpp" +#include "glfeatures.hpp" namespace gltrace { @@ -85,7 +85,7 @@ public: class Context { public: - glprofile::Profile profile; + glfeatures::Profile profile; bool user_arrays; bool user_arrays_nv; bool userArraysOnBegin; @@ -98,7 +98,7 @@ public: std::map <GLuint, Buffer> buffers; Context(void) : - profile(glprofile::API_GL, 1, 0), + profile(glfeatures::API_GL, 1, 0), user_arrays(false), user_arrays_nv(false), userArraysOnBegin(false), diff --git a/wrappers/gltrace.py b/wrappers/gltrace.py index 3695e977..fe1af817 100644 --- a/wrappers/gltrace.py +++ b/wrappers/gltrace.py @@ -153,7 +153,7 @@ class GlTracer(Tracer): print ' return false;' print ' }' print - print ' glprofile::Profile profile = ctx->profile;' + print ' glfeatures::Profile profile = ctx->profile;' print ' bool es1 = profile.es() && profile.major == 1;' print @@ -969,7 +969,7 @@ class GlTracer(Tracer): print '{' print ' gltrace::Context *ctx = gltrace::getContext();' print - print ' glprofile::Profile profile = ctx->profile;' + print ' glfeatures::Profile profile = ctx->profile;' print ' bool es1 = profile.es() && profile.major == 1;' print diff --git a/wrappers/gltrace_state.cpp b/wrappers/gltrace_state.cpp index 4ef095bd..be029fdd 100644 --- a/wrappers/gltrace_state.cpp +++ b/wrappers/gltrace_state.cpp @@ -141,7 +141,7 @@ void setContext(uintptr_t context_id) ts->current_context = ctx; if (!ctx->bound) { - ctx->profile = glprofile::getCurrentContextProfile(); + ctx->profile = glfeatures::getCurrentContextProfile(); /* * The default viewport and scissor state is set when a context is |