| Index: third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
|
| index 11bfcbedb60e5b0a1e361185a2bf4fd7661efbbf..64d690f7a565e5e40b704c2251a1111af42f0240 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
|
| @@ -619,11 +619,19 @@ public:
|
| }
|
| }
|
|
|
| + void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) override
|
| + {
|
| + for (GLsizei i = 0; i < n; ++i)
|
| + renderbuffers[i] = m_nextGenRenderbufferId++;
|
| + }
|
| +
|
| uint32_t stencilAttachment() const { return m_stencilAttachment; }
|
| uint32_t depthAttachment() const { return m_depthAttachment; }
|
| uint32_t depthStencilAttachment() const { return m_depthStencilAttachment; }
|
| + size_t numAllocatedRenderBuffer() const { return m_nextGenRenderbufferId - 1; }
|
|
|
| private:
|
| + uint32_t m_nextGenRenderbufferId = 1;
|
| uint32_t m_depthAttachment = 0;
|
| uint32_t m_stencilAttachment = 0;
|
| uint32_t m_depthStencilAttachment = 0;
|
| @@ -631,10 +639,9 @@ private:
|
|
|
| class DepthStencilTrackingContext : public MockWebGraphicsContext3D {
|
| public:
|
| - DepthStencilTrackingContext() : m_nextRenderBufferId(1) {}
|
| ~DepthStencilTrackingContext() override {}
|
|
|
| - int numAllocatedRenderBuffer() const { return m_nextRenderBufferId - 1; }
|
| + size_t numAllocatedRenderBuffer() const { return m_contextGL.numAllocatedRenderBuffer(); }
|
| WebGLId stencilAttachment() const { return m_contextGL.stencilAttachment(); }
|
| WebGLId depthAttachment() const { return m_contextGL.depthAttachment(); }
|
| WebGLId depthStencilAttachment() const { return m_contextGL.depthStencilAttachment(); }
|
| @@ -647,15 +654,9 @@ public:
|
| return WebString();
|
| }
|
|
|
| - WebGLId createRenderbuffer() override
|
| - {
|
| - return ++m_nextRenderBufferId;
|
| - }
|
| -
|
| gpu::gles2::GLES2Interface* getGLES2Interface() override { return &m_contextGL; }
|
|
|
| private:
|
| - WebGLId m_nextRenderBufferId;
|
| DepthStencilTrackingGLES2Interface m_contextGL;
|
| };
|
|
|
| @@ -668,7 +669,7 @@ struct DepthStencilTestCase {
|
|
|
| bool requestStencil;
|
| bool requestDepth;
|
| - int expectedRenderBuffers;
|
| + size_t expectedRenderBuffers;
|
| const char* const testCaseName;
|
| };
|
|
|
|
|