projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
evergreen: set gl_texture_image::TexFormat field in evergreenSetTexBuffer()
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
sis
/
sis_dd.c
diff --git
a/src/mesa/drivers/dri/sis/sis_dd.c
b/src/mesa/drivers/dri/sis/sis_dd.c
index bddc4a9285ce829a0be8705738ec3a0dfc103806..90e894b842c98364e29203d1c59e761a12a6c7e2 100644
(file)
--- a/
src/mesa/drivers/dri/sis/sis_dd.c
+++ b/
src/mesa/drivers/dri/sis/sis_dd.c
@@
-40,8
+40,7
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "sis_state.h"
#include "sis_tris.h"
#include "sis_state.h"
#include "sis_tris.h"
-#include "swrast/swrast.h"
-#include "main/framebuffer.h"
+#include "main/formats.h"
#include "main/renderbuffer.h"
#include "utils.h"
#include "main/renderbuffer.h"
#include "utils.h"
@@
-51,7
+50,7
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
/* Return the width and height of the given buffer.
*/
static void
/* Return the width and height of the given buffer.
*/
static void
-sisGetBufferSize(
GL
framebuffer *buffer,
+sisGetBufferSize(
struct gl_
framebuffer *buffer,
GLuint *width, GLuint *height )
{
GET_CURRENT_CONTEXT(ctx);
GLuint *width, GLuint *height )
{
GET_CURRENT_CONTEXT(ctx);
@@
-66,7
+65,7
@@
sisGetBufferSize( GLframebuffer *buffer,
/* Return various strings for glGetString().
*/
static const GLubyte *
/* Return various strings for glGetString().
*/
static const GLubyte *
-sisGetString(
GL
context *ctx, GLenum name )
+sisGetString(
struct gl_
context *ctx, GLenum name )
{
sisContextPtr smesa = SIS_CONTEXT(ctx);
static char buffer[128];
{
sisContextPtr smesa = SIS_CONTEXT(ctx);
static char buffer[128];
@@
-91,7
+90,7
@@
sisGetString( GLcontext *ctx, GLenum name )
/* Send all commands to the hardware.
*/
static void
/* Send all commands to the hardware.
*/
static void
-sisFlush(
GL
context *ctx )
+sisFlush(
struct gl_
context *ctx )
{
sisContextPtr smesa = SIS_CONTEXT(ctx);
{
sisContextPtr smesa = SIS_CONTEXT(ctx);
@@
-102,7
+101,7
@@
sisFlush( GLcontext *ctx )
* completed processing.
*/
static void
* completed processing.
*/
static void
-sisFinish(
GL
context *ctx )
+sisFinish(
struct gl_
context *ctx )
{
sisContextPtr smesa = SIS_CONTEXT(ctx);
{
sisContextPtr smesa = SIS_CONTEXT(ctx);
@@
-119,7
+118,7
@@
sisDeleteRenderbuffer(struct gl_renderbuffer *rb)
}
static GLboolean
}
static GLboolean
-sisRenderbufferStorage(
GL
context *ctx, struct gl_renderbuffer *rb,
+sisRenderbufferStorage(
struct gl_
context *ctx, struct gl_renderbuffer *rb,
GLenum internalFormat, GLuint width, GLuint height)
{
rb->Width = width;
GLenum internalFormat, GLuint width, GLuint height)
{
rb->Width = width;
@@
-142,25
+141,25
@@
sisInitRenderbuffer(struct gl_renderbuffer *rb, GLenum format)
if (format == GL_RGBA) {
/* Color */
if (format == GL_RGBA) {
/* Color */
- rb->
_BaseFormat = GL_RGBA
;
+ rb->
Format = MESA_FORMAT_ARGB8888
;
rb->DataType = GL_UNSIGNED_BYTE;
}
else if (format == GL_DEPTH_COMPONENT16) {
/* Depth */
rb->DataType = GL_UNSIGNED_BYTE;
}
else if (format == GL_DEPTH_COMPONENT16) {
/* Depth */
- rb->_BaseFormat = GL_DEPTH_COMPONENT;
/* we always Get/Put 32-bit Z values */
/* we always Get/Put 32-bit Z values */
+ rb->Format = MESA_FORMAT_Z16;
rb->DataType = GL_UNSIGNED_INT;
}
else if (format == GL_DEPTH_COMPONENT24) {
/* Depth */
rb->DataType = GL_UNSIGNED_INT;
}
else if (format == GL_DEPTH_COMPONENT24) {
/* Depth */
- rb->_BaseFormat = GL_DEPTH_COMPONENT;
/* we always Get/Put 32-bit Z values */
/* we always Get/Put 32-bit Z values */
+ rb->Format = MESA_FORMAT_Z32;
rb->DataType = GL_UNSIGNED_INT;
}
else {
/* Stencil */
ASSERT(format == GL_STENCIL_INDEX8_EXT);
rb->DataType = GL_UNSIGNED_INT;
}
else {
/* Stencil */
ASSERT(format == GL_STENCIL_INDEX8_EXT);
- rb->
_BaseFormat = GL_STENCIL_INDEX
;
+ rb->
Format = MESA_FORMAT_S8
;
rb->DataType = GL_UNSIGNED_BYTE;
}
rb->DataType = GL_UNSIGNED_BYTE;
}