Silence unused private member warning Removed mConfig from Context and related functions. Change-Id: I91eba6a4dbbd8ff48f212a246b1894009d513436 Reviewed-on: https://swiftshader-review.googlesource.com/5531 Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/Context.cpp b/src/OpenGL/libGLESv2/Context.cpp index dd44f79..de1cb57 100644 --- a/src/OpenGL/libGLESv2/Context.cpp +++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -42,8 +42,8 @@ namespace es2 { -Context::Context(egl::Display *display, const egl::Config *config, const Context *shareContext, EGLint clientVersion) - : egl::Context(display), clientVersion(clientVersion), mConfig(config) +Context::Context(egl::Display *display, const Context *shareContext, EGLint clientVersion) + : egl::Context(display), clientVersion(clientVersion) { sw::Context *context = new sw::Context(); device = new es2::Device(context); @@ -4366,8 +4366,8 @@ } -egl::Context *es2CreateContext(egl::Display *display, const egl::Config *config, const egl::Context *shareContext, int clientVersion) +egl::Context *es2CreateContext(egl::Display *display, const egl::Context *shareContext, int clientVersion) { ASSERT(!shareContext || shareContext->getClientVersion() == clientVersion); // Should be checked by eglCreateContext - return new es2::Context(display, config, static_cast<const es2::Context*>(shareContext), clientVersion); + return new es2::Context(display, static_cast<const es2::Context*>(shareContext), clientVersion); }
diff --git a/src/OpenGL/libGLESv2/Context.h b/src/OpenGL/libGLESv2/Context.h index bf1f4ae..10e6a5a 100644 --- a/src/OpenGL/libGLESv2/Context.h +++ b/src/OpenGL/libGLESv2/Context.h
@@ -425,7 +425,7 @@ class Context : public egl::Context { public: - Context(egl::Display *display, const egl::Config *config, const Context *shareContext, EGLint clientVersion); + Context(egl::Display *display, const Context *shareContext, EGLint clientVersion); virtual void makeCurrent(egl::Surface *surface); virtual EGLint getClientVersion() const; @@ -720,7 +720,6 @@ Query *createQuery(GLuint handle, GLenum type); const EGLint clientVersion; - const egl::Config *const mConfig; State mState;
diff --git a/src/OpenGL/libGLESv2/libGLESv2.hpp b/src/OpenGL/libGLESv2/libGLESv2.hpp index f858ba7..7b0354e 100644 --- a/src/OpenGL/libGLESv2/libGLESv2.hpp +++ b/src/OpenGL/libGLESv2/libGLESv2.hpp
@@ -241,7 +241,7 @@ void (*glGenerateMipmapOES)(GLenum target); void (*glDrawBuffersEXT)(GLsizei n, const GLenum *bufs); - egl::Context *(*es2CreateContext)(egl::Display *display, const egl::Config *config, const egl::Context *shareContext, int clientVersion); + egl::Context *(*es2CreateContext)(egl::Display *display, const egl::Context *shareContext, int clientVersion); __eglMustCastToProperFunctionPointerType (*es2GetProcAddress)(const char *procname); egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config); egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
diff --git a/src/OpenGL/libGLESv2/main.cpp b/src/OpenGL/libGLESv2/main.cpp index 001aa7a..12ed31d 100644 --- a/src/OpenGL/libGLESv2/main.cpp +++ b/src/OpenGL/libGLESv2/main.cpp
@@ -1327,7 +1327,7 @@ } } -egl::Context *es2CreateContext(egl::Display *display, const egl::Config *config, const egl::Context *shareContext, int clientVersion); +egl::Context *es2CreateContext(egl::Display *display, const egl::Context *shareContext, int clientVersion); extern "C" __eglMustCastToProperFunctionPointerType es2GetProcAddress(const char *procname); egl::Image *createBackBuffer(int width, int height, const egl::Config *config); egl::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);