commit 0e120e3daef63029b27860d3b9ad3ae896b78606
author Geoff Lang <geoff.lang@transgaming.com> Wed May 29 10:23:55 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:04:45 2013 -0400
tree b8966ef5bc1e0447ff2e8b32f009fe8b00fe819d
parent 61e49a5cacc894fe2de1273c65374a5e7083a05f

Added a Renderer::getMaxSupportedFormatSamples method to query the max support samples for a specific internal texture format.

TRAC #23212

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

src/libGLESv2/renderer/Renderer.h

diff --git a/src/libGLESv2/renderer/Renderer.h b/src/libGLESv2/renderer/Renderer.h
index e37c966..5d0b9d7 100644
--- a/src/libGLESv2/renderer/Renderer.h
+++ b/src/libGLESv2/renderer/Renderer.h
@@ -201,6 +201,7 @@
     virtual int getMaxSwapInterval() const = 0;
 
     virtual GLsizei getMaxSupportedSamples() const = 0;
+    virtual GLsizei getMaxSupportedFormatSamples(GLint internalFormat) const = 0;
 
     virtual unsigned int getMaxRenderTargets() const = 0;
 

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index a96ecd5..5aad912 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -2482,6 +2482,13 @@
     return mMaxSupportedSamples;
 }
 
+GLsizei Renderer11::getMaxSupportedFormatSamples(GLint internalFormat) const
+{
+    DXGI_FORMAT format = gl_d3d11::GetTexFormat(internalFormat, getCurrentClientVersion());
+    MultisampleSupportMap::const_iterator iter = mMultisampleSupportMap.find(format);
+    return (iter != mMultisampleSupportMap.end()) ? iter->second.maxSupportedSamples : 0;
+}
+
 int Renderer11::getNearestSupportedSamples(DXGI_FORMAT format, unsigned int requested) const
 {
     if (requested == 0)

src/libGLESv2/renderer/Renderer11.h

diff --git a/src/libGLESv2/renderer/Renderer11.h b/src/libGLESv2/renderer/Renderer11.h
index 399ff6a..19ccee8 100644
--- a/src/libGLESv2/renderer/Renderer11.h
+++ b/src/libGLESv2/renderer/Renderer11.h
@@ -142,6 +142,7 @@
     virtual int getMaxSwapInterval() const;
 
     virtual GLsizei getMaxSupportedSamples() const;
+    virtual GLsizei getMaxSupportedFormatSamples(GLint internalFormat) const;
     int getNearestSupportedSamples(DXGI_FORMAT format, unsigned int requested) const;
 
     virtual unsigned int getMaxRenderTargets() const;

src/libGLESv2/renderer/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 02efc69..8f690df 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -2436,6 +2436,13 @@
     return mMaxSupportedSamples;
 }
 
+GLsizei Renderer9::getMaxSupportedFormatSamples(GLint internalFormat) const
+{
+    D3DFORMAT format = gl_d3d9::GetTexureFormat(internalFormat, this);
+    MultisampleSupportMap::const_iterator itr = mMultiSampleSupport.find(format);
+    return (itr != mMultiSampleSupport.end()) ? mMaxSupportedSamples : 0;
+}
+
 int Renderer9::getNearestSupportedSamples(D3DFORMAT format, int requested) const
 {
     if (requested == 0)

src/libGLESv2/renderer/Renderer9.h

diff --git a/src/libGLESv2/renderer/Renderer9.h b/src/libGLESv2/renderer/Renderer9.h
index a0d9fa7..6b3e5d6 100644
--- a/src/libGLESv2/renderer/Renderer9.h
+++ b/src/libGLESv2/renderer/Renderer9.h
@@ -158,6 +158,7 @@
     virtual int getMaxSwapInterval() const;
 
     virtual GLsizei getMaxSupportedSamples() const;
+    virtual GLsizei getMaxSupportedFormatSamples(GLint internalFormat) const;
     int getNearestSupportedSamples(D3DFORMAT format, int requested) const;
     
     virtual unsigned int getMaxRenderTargets() const;