EGL: Add const to several methods.

src/libANGLE/Context.cpp

@@ -2614,7 +2614,7 @@ GLenum Context::getGraphicsResetStatus()
     return ToGLenum(mResetStatus);
 }
 
-bool Context::isResetNotificationEnabled()
+bool Context::isResetNotificationEnabled() const
 {
     return (mResetStrategy == GL_LOSE_CONTEXT_ON_RESET_EXT);
 }

src/libANGLE/Context.h

@@ -478,7 +478,7 @@ class Context final : public egl::LabeledObject, angle::NonCopyable, public angl
     void setContextLost();
 
     GLenum getGraphicsResetStrategy() const { return mResetStrategy; }
-    bool isResetNotificationEnabled();
+    bool isResetNotificationEnabled() const;
 
     const egl::Config *getConfig() const;
     EGLenum getClientType() const;

src/libANGLE/Device.cpp

@@ -110,9 +110,9 @@ Error Device::getAttribute(EGLint attribute, EGLAttrib *value)
     return error;
 }
 
-EGLint Device::getType()
+EGLint Device::getType() const
 {
-    return getImplementation()->getType();
+    return mImplementation.get()->getType();
 }
 
 void Device::initDeviceExtensions()

src/libANGLE/Device.h

@@ -33,8 +33,8 @@ class Device final : public LabeledObject, angle::NonCopyable
     EGLLabelKHR getLabel() const override;
 
     Error getAttribute(EGLint attribute, EGLAttrib *value);
-    Display *getOwningDisplay() { return mOwningDisplay; }
-    EGLint getType();
+    Display *getOwningDisplay() const { return mOwningDisplay; }
+    EGLint getType() const;
 
     const DeviceExtensions &getExtensions() const;
     const std::string &getExtensionString() const;

src/libANGLE/Display.cpp

@@ -1750,7 +1750,7 @@ Error Display::validateImageClientBuffer(const gl::Context *context,
     return mImplementation->validateImageClientBuffer(context, target, clientBuffer, attribs);
 }
 
-Error Display::valdiatePixmap(Config *config,
+Error Display::valdiatePixmap(const Config *config,
                               EGLNativePixmapType pixmap,
                               const AttributeMap &attributes) const
 {

src/libANGLE/Display.h

@@ -199,7 +199,7 @@ class Display final : public LabeledObject,
                                     EGLenum target,
                                     EGLClientBuffer clientBuffer,
                                     const egl::AttributeMap &attribs) const;
-    Error valdiatePixmap(Config *config,
+    Error valdiatePixmap(const Config *config,
                          EGLNativePixmapType pixmap,
                          const AttributeMap &attributes) const;
 

src/libANGLE/Stream.cpp

@@ -237,7 +237,7 @@ bool Stream::isConsumerBoundToContext(const gl::Context *context) const
     return (context == mContext);
 }
 
-Error Stream::validateD3D11Texture(void *texture, const AttributeMap &attributes) const
+Error Stream::validateD3D11Texture(const void *texture, const AttributeMap &attributes) const
 {
     ASSERT(mConsumerType == ConsumerType::GLTextureRGB ||
            mConsumerType == ConsumerType::GLTextureYUV);

src/libANGLE/Stream.h

@@ -100,7 +100,7 @@ class Stream final : public LabeledObject, angle::NonCopyable
     bool isConsumerBoundToContext(const gl::Context *context) const;
 
     // Producer methods
-    Error validateD3D11Texture(void *texture, const AttributeMap &attributes) const;
+    Error validateD3D11Texture(const void *texture, const AttributeMap &attributes) const;
     Error postD3D11Texture(void *texture, const AttributeMap &attributes);
 
   private:

src/libANGLE/renderer/DisplayImpl.cpp

@@ -92,7 +92,7 @@ egl::Error DisplayImpl::validateImageClientBuffer(const gl::Context *context,
     return egl::EglBadDisplay() << "DisplayImpl::validateImageClientBuffer unimplemented.";
 }
 
-egl::Error DisplayImpl::validatePixmap(egl::Config *config,
+egl::Error DisplayImpl::validatePixmap(const egl::Config *config,
                                        EGLNativePixmapType pixmap,
                                        const egl::AttributeMap &attributes) const
 {

src/libANGLE/renderer/DisplayImpl.h

@@ -90,7 +90,7 @@ class DisplayImpl : public EGLImplFactory, public angle::Subject
                                                  EGLenum target,
                                                  EGLClientBuffer clientBuffer,
                                                  const egl::AttributeMap &attribs) const;
-    virtual egl::Error validatePixmap(egl::Config *config,
+    virtual egl::Error validatePixmap(const egl::Config *config,
                                       EGLNativePixmapType pixmap,
                                       const egl::AttributeMap &attributes) const;
 

src/libANGLE/renderer/StreamProducerImpl.h

@@ -23,7 +23,7 @@ class StreamProducerImpl : angle::NonCopyable
 
     // Validates the ability for the producer to accept an arbitrary pointer to a frame. All
     // pointers should be validated through this function before being used to produce a frame.
-    virtual egl::Error validateD3DTexture(void *pointer,
+    virtual egl::Error validateD3DTexture(const void *pointer,
                                           const egl::AttributeMap &attributes) const = 0;
 
     // Constructs a frame from an arbitrary external pointer that points to producer specific frame

src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp

@@ -112,10 +112,11 @@ StreamProducerD3DTexture::~StreamProducerD3DTexture()
     SafeRelease(mTexture);
 }
 
-egl::Error StreamProducerD3DTexture::validateD3DTexture(void *pointer,
+egl::Error StreamProducerD3DTexture::validateD3DTexture(const void *pointer,
                                                         const egl::AttributeMap &attributes) const
 {
-    ID3D11Texture2D *textureD3D = static_cast<ID3D11Texture2D *>(pointer);
+    // We must remove the const qualifier because "GetDevice" and "GetDesc" are non-const in D3D11.
+    ID3D11Texture2D *textureD3D = static_cast<ID3D11Texture2D *>(const_cast<void *>(pointer));
 
     // Check that the texture originated from our device
     ID3D11Device *device;

src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h

@@ -21,7 +21,7 @@ class StreamProducerD3DTexture : public StreamProducerImpl
     StreamProducerD3DTexture(Renderer11 *renderer);
     ~StreamProducerD3DTexture() override;
 
-    egl::Error validateD3DTexture(void *pointer,
+    egl::Error validateD3DTexture(const void *pointer,
                                   const egl::AttributeMap &attributes) const override;
     void postD3DTexture(void *pointer, const egl::AttributeMap &attributes) override;
     egl::Stream::GLTextureDescription getGLFrameDescription(int planeIndex) override;

src/libANGLE/renderer/gl/glx/DisplayGLX.cpp

@@ -462,7 +462,7 @@ SurfaceImpl *DisplayGLX::createPixmapSurface(const egl::SurfaceState &state,
     return new PixmapSurfaceGLX(state, nativePixmap, mGLX.getDisplay(), mGLX, fbConfig);
 }
 
-egl::Error DisplayGLX::validatePixmap(egl::Config *config,
+egl::Error DisplayGLX::validatePixmap(const egl::Config *config,
                                       EGLNativePixmapType pixmap,
                                       const egl::AttributeMap &attributes) const
 {

src/libANGLE/renderer/gl/glx/DisplayGLX.h

@@ -53,7 +53,7 @@ class DisplayGLX : public DisplayGL
                                      NativePixmapType nativePixmap,
                                      const egl::AttributeMap &attribs) override;
 
-    egl::Error validatePixmap(egl::Config *config,
+    egl::Error validatePixmap(const egl::Config *config,
                               EGLNativePixmapType pixmap,
                               const egl::AttributeMap &attributes) const override;