Fix some style issues

src/libANGLE/Context.cpp

@@ -638,7 +638,7 @@ GLuint Context::createSampler()
 
 GLuint Context::createTransformFeedback()
 {
-    GLuint transformFeedback = mTransformFeedbackAllocator.allocate();
+    GLuint transformFeedback = mTransformFeedbackHandleAllocator.allocate();
     mTransformFeedbackMap.assign(transformFeedback, nullptr);
     return transformFeedback;
 }
@@ -845,7 +845,7 @@ void Context::deleteTransformFeedback(GLuint transformFeedback)
             transformFeedbackObject->release(this);
         }
 
-        mTransformFeedbackAllocator.release(transformFeedback);
+        mTransformFeedbackHandleAllocator.release(transformFeedback);
     }
 }
 

src/libANGLE/Context.h

@@ -898,7 +898,7 @@ class Context final : public ValidationContext
     HandleAllocator mVertexArrayHandleAllocator;
 
     ResourceMap<TransformFeedback> mTransformFeedbackMap;
-    HandleAllocator mTransformFeedbackAllocator;
+    HandleAllocator mTransformFeedbackHandleAllocator;
 
     const char *mVersionString;
     const char *mShadingLanguageString;

src/libANGLE/ResourceManager.cpp

@@ -272,7 +272,7 @@ GLuint RenderbufferManager::createRenderbuffer()
     return AllocateEmptyObject(&mHandleAllocator, &mObjectMap);
 }
 
-Renderbuffer *RenderbufferManager::getRenderbuffer(GLuint handle)
+Renderbuffer *RenderbufferManager::getRenderbuffer(GLuint handle) const
 {
     return mObjectMap.query(handle);
 }
@@ -298,12 +298,12 @@ GLuint SamplerManager::createSampler()
     return AllocateEmptyObject(&mHandleAllocator, &mObjectMap);
 }
 
-Sampler *SamplerManager::getSampler(GLuint handle)
+Sampler *SamplerManager::getSampler(GLuint handle) const
 {
     return mObjectMap.query(handle);
 }
 
-bool SamplerManager::isSampler(GLuint sampler)
+bool SamplerManager::isSampler(GLuint sampler) const
 {
     return mObjectMap.contains(sampler);
 }
@@ -325,7 +325,7 @@ GLuint FenceSyncManager::createFenceSync(rx::GLImplFactory *factory)
     return handle;
 }
 
-FenceSync *FenceSyncManager::getFenceSync(GLuint handle)
+FenceSync *FenceSyncManager::getFenceSync(GLuint handle) const
 {
     return mObjectMap.query(handle);
 }

src/libANGLE/ResourceManager.h

@@ -173,7 +173,7 @@ class RenderbufferManager
 {
   public:
     GLuint createRenderbuffer();
-    Renderbuffer *getRenderbuffer(GLuint handle);
+    Renderbuffer *getRenderbuffer(GLuint handle) const;
 
     Renderbuffer *checkRenderbufferAllocation(rx::GLImplFactory *factory, GLuint handle)
     {
@@ -191,8 +191,8 @@ class SamplerManager : public TypedResourceManager<Sampler, HandleAllocator, Sam
 {
   public:
     GLuint createSampler();
-    Sampler *getSampler(GLuint handle);
-    bool isSampler(GLuint sampler);
+    Sampler *getSampler(GLuint handle) const;
+    bool isSampler(GLuint sampler) const;
 
     Sampler *checkSamplerAllocation(rx::GLImplFactory *factory, GLuint handle)
     {
@@ -210,7 +210,7 @@ class FenceSyncManager : public TypedResourceManager<FenceSync, HandleAllocator,
 {
   public:
     GLuint createFenceSync(rx::GLImplFactory *factory);
-    FenceSync *getFenceSync(GLuint handle);
+    FenceSync *getFenceSync(GLuint handle) const;
 
     static void DeleteObject(const Context *context, FenceSync *fenceSync);
 

src/libANGLE/State.cpp

@@ -261,8 +261,6 @@ void State::reset(const Context *context)
         buf.set(context, nullptr);
     }
 
-    mProgram = nullptr;
-
     angle::Matrix<GLfloat>::setToIdentity(mPathMatrixProj);
     angle::Matrix<GLfloat>::setToIdentity(mPathMatrixMV);
     mPathStencilFunc = GL_ALWAYS;