Move sampler state structure to angle types header.

TRAC #22251 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch Author: Geoff Lang/Shannon Woods git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1662 736b8ea6-26fd-11df-bfd4-992fa37f6226

Move sampler state structure to angle types header.
8bc304a1 · daniel@transgaming.com · 5cdd0586 · 8bc304a1 · 8bc304a1
Commit 8bc304a1 authored Jan 11, 2013 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 10 deletions

Texture.h src/libGLESv2/Texture.h +1 -10

angletypes.h src/libGLESv2/angletypes.h +10 -0

No files found.
--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -22,6 +22,7 @@
 #include "libGLESv2/renderer/TextureStorage.h"
 #include "libGLESv2/Renderbuffer.h"
 #include "libGLESv2/utilities.h"
+#include "libGLESv2/angletypes.h"
 namespace egl
 {
@@ -48,16 +49,6 @@ enum
    IMPLEMENTATION_MAX_TEXTURE_LEVELS = 15   // 1+log2 of MAX_TEXTURE_SIZE
 };
-struct SamplerState
-{
-    GLenum minFilter;
-    GLenum magFilter;
-    GLenum wrapS;
-    GLenum wrapT;
-    float maxAnisotropy;
-    int lodOffset;
-};
 class Texture : public RefCountObject
 {
  public:

--- a/src/libGLESv2/angletypes.h
+++ b/src/libGLESv2/angletypes.h
@@ -98,6 +98,16 @@ struct DepthStencilState
    GLuint stencilBackWritemask;
 };
+struct SamplerState
+{
+    GLenum minFilter;
+    GLenum magFilter;
+    GLenum wrapS;
+    GLenum wrapT;
+    float maxAnisotropy;
+    int lodOffset;
+};
 struct ClearParameters
 {
    GLbitfield mask;