[Mesa-dev] [PATCH V2 02/22] mesa: add stubs for new entrypoints for ARB_texture_multisample

[Chris Forbes]

V2: - Remove spurious duplicate prototypes in teximage.h

Signed-off-by: Chris Forbes <chr...@ijw.co.nz>
---
 src/mesa/main/multisample.c | 15 +++++++++++++++
 src/mesa/main/multisample.h |  5 +++++
 src/mesa/main/teximage.c    | 20 ++++++++++++++++++++
 src/mesa/main/teximage.h    | 10 ++++++++++
 4 files changed, 50 insertions(+)

diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index f792ad0..25c20e3 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -60,3 +60,18 @@ _mesa_init_multisample(struct gl_context *ctx)
    ctx->Multisample.SampleCoverageValue = 1.0;
    ctx->Multisample.SampleCoverageInvert = GL_FALSE;
 }
+
+void GLAPIENTRY
+_mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat * val)
+{
+   assert(!"Not implemented");
+   // TODO: make this work
+}
+
+void GLAPIENTRY
+_mesa_SampleMaski(GLuint index, GLbitfield mask)
+{
+   assert(!"Not implemented");
+   // TODO: make this work
+}
+
diff --git a/src/mesa/main/multisample.h b/src/mesa/main/multisample.h
index 30726c3..9810e6a 100644
--- a/src/mesa/main/multisample.h
+++ b/src/mesa/main/multisample.h
@@ -37,5 +37,10 @@ _mesa_SampleCoverage(GLclampf value, GLboolean invert);
 extern void
 _mesa_init_multisample(struct gl_context *ctx);
 
+extern void GLAPIENTRY
+_mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat* val);
+
+extern void GLAPIENTRY
+_mesa_SampleMaski(GLuint index, GLbitfield mask);
 
 #endif
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index ff3c92c..889e875 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4104,3 +4104,23 @@ _mesa_TexBufferRange(GLenum target, GLenum 
internalFormat, GLuint buffer,
 
    texbufferrange(ctx, target, internalFormat, bufObj, offset, size);
 }
+
+
+/** GL_ARB_texture_multisample */
+void GLAPIENTRY
+_mesa_TexImage2DMultisample(GLenum target, GLsizei samples,
+      GLint internalformat, GLsizei width, GLsizei height,
+      GLboolean fixedsamplelocations)
+{
+   assert(!"Not implemented");
+   /* allocate a single 2d multisample texture */
+}
+
+void GLAPIENTRY
+_mesa_TexImage3DMultisample(GLenum target, GLsizei samples,
+      GLint internalformat, GLsizei width, GLsizei height,
+      GLsizei depth, GLboolean fixedsamplelocations)
+{
+   assert(!"Not implemented");
+   /* allocate an array of 2d multisample textures */
+}
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 7124cac..f17cdac 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -294,6 +294,16 @@ _mesa_TexBufferRange(GLenum target, GLenum internalFormat, 
GLuint buffer,
                      GLintptr offset, GLsizeiptr size);
 
 
+extern void GLAPIENTRY
+_mesa_TexImage2DMultisample(GLenum target, GLsizei samples,
+                            GLint internalformat, GLsizei width, GLsizei 
height,
+                            GLboolean fixedsamplelocations);
+
+extern void GLAPIENTRY
+_mesa_TexImage3DMultisample(GLenum target, GLsizei samples,
+                            GLint internalformat, GLsizei width, GLsizei 
height,
+                            GLsizei depth, GLboolean fixedsamplelocations);
+
 /*@}*/
 
 #ifdef __cplusplus
-- 
1.8.1.2

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev