summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-05 17:50:33 -0600
committerBrian Paul <brianp@vmware.com>2009-10-05 17:50:36 -0600
commitbe0765cd6ec47cf068775197f312a1123e044566 (patch)
treee2f159df3845118595e784e05f50ccf9030ef082 /src
parent7e7f38a67d82191076b95f6faa0d419df68610da (diff)
mesa: move gl_format_info struct to formats.c
This is a private datatype.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/formats.c37
-rw-r--r--src/mesa/main/formats.h38
2 files changed, 37 insertions, 38 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index c98e90d1c3d..e38c51772d5 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -31,6 +31,43 @@
/**
+ * Information about texture formats.
+ */
+struct gl_format_info
+{
+ gl_format Name;
+
+ /**
+ * Base format is one of GL_RGB, GL_RGBA, GL_ALPHA, GL_LUMINANCE,
+ * GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_COLOR_INDEX, GL_DEPTH_COMPONENT.
+ */
+ GLenum BaseFormat;
+
+ /**
+ * Logical data type: one of GL_UNSIGNED_NORMALIZED, GL_SIGNED_NORMALED,
+ * GL_UNSIGNED_INT, GL_SIGNED_INT, GL_FLOAT.
+ */
+ GLenum DataType;
+
+ GLubyte RedBits;
+ GLubyte GreenBits;
+ GLubyte BlueBits;
+ GLubyte AlphaBits;
+ GLubyte LuminanceBits;
+ GLubyte IntensityBits;
+ GLubyte IndexBits;
+ GLubyte DepthBits;
+ GLubyte StencilBits;
+
+ /**
+ * To describe compressed formats. If not compressed, Width=Height=1.
+ */
+ GLubyte BlockWidth, BlockHeight;
+ GLubyte BytesPerBlock;
+};
+
+
+/**
* Info about each format.
* These must be in the same order as the MESA_FORMAT_* enums so that
* we can do lookups without searching.
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index 7a2a948991d..723e237a579 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -137,44 +137,6 @@ typedef enum
} gl_format;
-/**
- * Information about texture formats.
- */
-struct gl_format_info
-{
- gl_format Name;
-
- /**
- * Base format is one of GL_RGB, GL_RGBA, GL_ALPHA, GL_LUMINANCE,
- * GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_COLOR_INDEX, GL_DEPTH_COMPONENT.
- */
- GLenum BaseFormat;
-
- /**
- * Logical data type: one of GL_UNSIGNED_NORMALIZED, GL_SIGNED_NORMALED,
- * GL_UNSIGNED_INT, GL_SIGNED_INT, GL_FLOAT.
- */
- GLenum DataType;
-
- GLubyte RedBits;
- GLubyte GreenBits;
- GLubyte BlueBits;
- GLubyte AlphaBits;
- GLubyte LuminanceBits;
- GLubyte IntensityBits;
- GLubyte IndexBits;
- GLubyte DepthBits;
- GLubyte StencilBits;
-
- /**
- * To describe compressed formats. If not compressed, Width=Height=1.
- */
- GLubyte BlockWidth, BlockHeight;
- GLubyte BytesPerBlock;
-};
-
-
-
extern GLuint
_mesa_get_format_bytes(gl_format format);