mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-03 20:48:08 +02:00
Merge commit 'origin/gallium-0.1' into gallium-0.2
This commit is contained in:
Brian Paul
commit
0c31661e73
11 changed files with 446 additions and 16 deletions
|
|
@ -77,6 +77,7 @@ SOURCES = \
|
|||
quadstrip-flat.c \
|
||||
quadstrip.c \
|
||||
tri-alpha.c \
|
||||
tri-array-interleaved.c \
|
||||
tri-blend-color.c \
|
||||
tri-blend-max.c \
|
||||
tri-blend-min.c \
|
||||
|
|
@ -102,6 +103,7 @@ SOURCES = \
|
|||
tri-repeat.c \
|
||||
tri-scissor-tri.c \
|
||||
tri-stencil.c \
|
||||
tri-stipple.c \
|
||||
tri-tex.c \
|
||||
tri-tex-3d.c \
|
||||
tri-tri.c \
|
||||
|
|
|
|||
119
progs/trivial/tri-array-interleaved.c
Normal file
119
progs/trivial/tri-array-interleaved.c
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
/* Test rebasing */
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#define GL_GLEXT_PROTOTYPES
|
||||
#include <GL/glut.h>
|
||||
|
||||
struct {
|
||||
GLubyte color[4];
|
||||
GLfloat vert[3];
|
||||
} verts[] = {
|
||||
|
||||
{ { 0x00, 0x00, 0xff, 0x00 },
|
||||
{ 0.9, -0.9, 0.0 } },
|
||||
|
||||
{ { 0x00, 0xff, 0x00, 0x00 },
|
||||
{ 0.9, 0.9, 0.0 } },
|
||||
|
||||
{ { 0xff, 0x00, 0x00, 0x00 },
|
||||
{ -0.9, 0.9, 0.0 } },
|
||||
|
||||
{ { 0xff, 0xff, 0xff, 0x00 },
|
||||
{ -0.9, -0.9, 0.0 } },
|
||||
};
|
||||
|
||||
GLuint indices[] = { 1, 2, 3 };
|
||||
|
||||
static void Init( void )
|
||||
{
|
||||
GLint errno;
|
||||
GLuint prognum;
|
||||
|
||||
static const char *prog1 =
|
||||
"!!ARBvp1.0\n"
|
||||
"MOV result.color, vertex.color;\n"
|
||||
"MOV result.position, vertex.position;\n"
|
||||
"END\n";
|
||||
|
||||
glGenProgramsARB(1, &prognum);
|
||||
glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prognum);
|
||||
glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
|
||||
strlen(prog1), (const GLubyte *) prog1);
|
||||
|
||||
assert(glIsProgramARB(prognum));
|
||||
errno = glGetError();
|
||||
printf("glGetError = %d\n", errno);
|
||||
if (errno != GL_NO_ERROR)
|
||||
{
|
||||
GLint errorpos;
|
||||
|
||||
glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorpos);
|
||||
printf("errorpos: %d\n", errorpos);
|
||||
printf("%s\n", (char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB));
|
||||
}
|
||||
|
||||
glInterleavedArrays( GL_C4UB_V3F, sizeof(verts[0]), verts );
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void Display( void )
|
||||
{
|
||||
glClearColor(0.3, 0.3, 0.3, 1);
|
||||
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
|
||||
|
||||
glEnable(GL_VERTEX_PROGRAM_NV);
|
||||
|
||||
/* Should have min_index == 1, maybe force a rebase:
|
||||
*/
|
||||
glDrawElements( GL_TRIANGLES, 3, GL_UNSIGNED_INT, indices );
|
||||
|
||||
glFlush();
|
||||
}
|
||||
|
||||
|
||||
static void Reshape( int width, int height )
|
||||
{
|
||||
glViewport( 0, 0, width, height );
|
||||
glMatrixMode( GL_PROJECTION );
|
||||
glLoadIdentity();
|
||||
glOrtho(-1.0, 1.0, -1.0, 1.0, -0.5, 1000.0);
|
||||
glMatrixMode( GL_MODELVIEW );
|
||||
glLoadIdentity();
|
||||
/*glTranslatef( 0.0, 0.0, -15.0 );*/
|
||||
}
|
||||
|
||||
|
||||
static void Key( unsigned char key, int x, int y )
|
||||
{
|
||||
(void) x;
|
||||
(void) y;
|
||||
switch (key) {
|
||||
case 27:
|
||||
exit(0);
|
||||
break;
|
||||
}
|
||||
glutPostRedisplay();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
int main( int argc, char *argv[] )
|
||||
{
|
||||
glutInit( &argc, argv );
|
||||
glutInitWindowPosition( 0, 0 );
|
||||
glutInitWindowSize( 250, 250 );
|
||||
glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH );
|
||||
glutCreateWindow(argv[0]);
|
||||
glutReshapeFunc( Reshape );
|
||||
glutKeyboardFunc( Key );
|
||||
glutDisplayFunc( Display );
|
||||
Init();
|
||||
glutMainLoop();
|
||||
return 0;
|
||||
}
|
||||
151
progs/trivial/tri-stipple.c
Normal file
151
progs/trivial/tri-stipple.c
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
/*
|
||||
* Copyright (c) 1991, 1992, 1993 Silicon Graphics, Inc.
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and
|
||||
* its documentation for any purpose is hereby granted without fee, provided
|
||||
* that (i) the above copyright notices and this permission notice appear in
|
||||
* all copies of the software and related documentation, and (ii) the name of
|
||||
* Silicon Graphics may not be used in any advertising or
|
||||
* publicity relating to the software without the specific, prior written
|
||||
* permission of Silicon Graphics.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF
|
||||
* ANY KIND,
|
||||
* EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
|
||||
* WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*
|
||||
* IN NO EVENT SHALL SILICON GRAPHICS BE LIABLE FOR
|
||||
* ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
|
||||
* OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
||||
* WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
|
||||
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
||||
* OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <GL/glut.h>
|
||||
|
||||
|
||||
#define CI_OFFSET_1 16
|
||||
#define CI_OFFSET_2 32
|
||||
|
||||
static GLubyte fly[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0x80, 0x01, 0xC0, 0x06, 0xC0, 0x03, 0x60, 0x04, 0x60, 0x06, 0x20,
|
||||
0x04, 0x30, 0x0C, 0x20, 0x04, 0x18, 0x18, 0x20, 0x04, 0x0C, 0x30, 0x20,
|
||||
0x04, 0x06, 0x60, 0x20, 0x44, 0x03, 0xC0, 0x22, 0x44, 0x01, 0x80, 0x22,
|
||||
0x44, 0x01, 0x80, 0x22, 0x44, 0x01, 0x80, 0x22, 0x44, 0x01, 0x80, 0x22,
|
||||
0x44, 0x01, 0x80, 0x22, 0x44, 0x01, 0x80, 0x22, 0x66, 0x01, 0x80, 0x66,
|
||||
0x33, 0x01, 0x80, 0xCC, 0x19, 0x81, 0x81, 0x98, 0x0C, 0xC1, 0x83, 0x30,
|
||||
0x07, 0xe1, 0x87, 0xe0, 0x03, 0x3f, 0xfc, 0xc0, 0x03, 0x31, 0x8c, 0xc0,
|
||||
0x03, 0x33, 0xcc, 0xc0, 0x06, 0x64, 0x26, 0x60, 0x0c, 0xcc, 0x33, 0x30,
|
||||
0x18, 0xcc, 0x33, 0x18, 0x10, 0xc4, 0x23, 0x08, 0x10, 0x63, 0xC6, 0x08,
|
||||
0x10, 0x30, 0x0c, 0x08, 0x10, 0x18, 0x18, 0x08, 0x10, 0x00, 0x00, 0x08};
|
||||
|
||||
|
||||
GLenum doubleBuffer;
|
||||
|
||||
static void Init(void)
|
||||
{
|
||||
fprintf(stderr, "GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
|
||||
fprintf(stderr, "GL_VERSION = %s\n", (char *) glGetString(GL_VERSION));
|
||||
fprintf(stderr, "GL_VENDOR = %s\n", (char *) glGetString(GL_VENDOR));
|
||||
|
||||
glEnable (GL_POLYGON_STIPPLE);
|
||||
glPolygonStipple (fly);
|
||||
|
||||
glClearColor(0.0, 0.0, 1.0, 0.0);
|
||||
}
|
||||
|
||||
static void Reshape(int width, int height)
|
||||
{
|
||||
|
||||
glViewport(0, 0, (GLint)width, (GLint)height);
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
/* glOrtho(-1.0, 1.0, -1.0, 1.0, -0.5, 1000.0); */
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
}
|
||||
|
||||
static void Key(unsigned char key, int x, int y)
|
||||
{
|
||||
|
||||
switch (key) {
|
||||
case 27:
|
||||
exit(1);
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
glutPostRedisplay();
|
||||
}
|
||||
|
||||
static void Draw(void)
|
||||
{
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
glBegin(GL_TRIANGLES);
|
||||
glColor3f(0,0,.7);
|
||||
glVertex3f( 0.9, -0.9, -0.0);
|
||||
glColor3f(.8,0,0);
|
||||
glVertex3f( 0.9, 0.9, -0.0);
|
||||
glColor3f(0,.9,0);
|
||||
glVertex3f(-0.9, 0.0, -0.0);
|
||||
glEnd();
|
||||
|
||||
glFlush();
|
||||
|
||||
if (doubleBuffer) {
|
||||
glutSwapBuffers();
|
||||
}
|
||||
}
|
||||
|
||||
static GLenum Args(int argc, char **argv)
|
||||
{
|
||||
GLint i;
|
||||
|
||||
doubleBuffer = GL_FALSE;
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (strcmp(argv[i], "-sb") == 0) {
|
||||
doubleBuffer = GL_FALSE;
|
||||
} else if (strcmp(argv[i], "-db") == 0) {
|
||||
doubleBuffer = GL_TRUE;
|
||||
} else {
|
||||
fprintf(stderr, "%s (Bad option).\n", argv[i]);
|
||||
return GL_FALSE;
|
||||
}
|
||||
}
|
||||
return GL_TRUE;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
GLenum type;
|
||||
|
||||
glutInit(&argc, argv);
|
||||
|
||||
if (Args(argc, argv) == GL_FALSE) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
glutInitWindowPosition(0, 0); glutInitWindowSize( 250, 250);
|
||||
|
||||
type = GLUT_RGB | GLUT_ALPHA;
|
||||
type |= (doubleBuffer) ? GLUT_DOUBLE : GLUT_SINGLE;
|
||||
glutInitDisplayMode(type);
|
||||
|
||||
if (glutCreateWindow("First Tri") == GL_FALSE) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Init();
|
||||
|
||||
glutReshapeFunc(Reshape);
|
||||
glutKeyboardFunc(Key);
|
||||
glutDisplayFunc(Draw);
|
||||
glutMainLoop();
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -103,6 +103,18 @@ void draw_flush( struct draw_context *draw )
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* Specify the Minimum Resolvable Depth factor for polygon offset.
|
||||
* This factor potentially depends on the number of Z buffer bits,
|
||||
* the rasterization algorithm and the arithmetic performed on Z
|
||||
* values between vertex shading and rasterization. It will vary
|
||||
* from one driver to another.
|
||||
*/
|
||||
void draw_set_mrd(struct draw_context *draw, double mrd)
|
||||
{
|
||||
draw->mrd = mrd;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Register new primitive rasterization/rendering state.
|
||||
|
|
@ -377,7 +389,7 @@ draw_set_mapped_element_buffer_range( struct draw_context *draw,
|
|||
unsigned eltSize,
|
||||
unsigned min_index,
|
||||
unsigned max_index,
|
||||
void *elements )
|
||||
const void *elements )
|
||||
{
|
||||
draw->pt.user.elts = elements;
|
||||
draw->pt.user.eltSize = eltSize;
|
||||
|
|
@ -389,7 +401,7 @@ draw_set_mapped_element_buffer_range( struct draw_context *draw,
|
|||
void
|
||||
draw_set_mapped_element_buffer( struct draw_context *draw,
|
||||
unsigned eltSize,
|
||||
void *elements )
|
||||
const void *elements )
|
||||
{
|
||||
draw->pt.user.elts = elements;
|
||||
draw->pt.user.eltSize = eltSize;
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ void draw_enable_line_stipple(struct draw_context *draw, boolean enable);
|
|||
|
||||
void draw_enable_point_sprites(struct draw_context *draw, boolean enable);
|
||||
|
||||
void draw_set_mrd(struct draw_context *draw, double mrd);
|
||||
|
||||
boolean
|
||||
draw_install_aaline_stage(struct draw_context *draw, struct pipe_context *pipe);
|
||||
|
|
@ -129,11 +130,11 @@ draw_set_mapped_element_buffer_range( struct draw_context *draw,
|
|||
unsigned eltSize,
|
||||
unsigned min_index,
|
||||
unsigned max_index,
|
||||
void *elements );
|
||||
const void *elements );
|
||||
|
||||
void draw_set_mapped_element_buffer( struct draw_context *draw,
|
||||
unsigned eltSize,
|
||||
void *elements );
|
||||
const void *elements );
|
||||
|
||||
void draw_set_mapped_vertex_buffer(struct draw_context *draw,
|
||||
unsigned attr, const void *buffer);
|
||||
|
|
|
|||
|
|
@ -122,9 +122,8 @@ static void offset_first_tri( struct draw_stage *stage,
|
|||
struct prim_header *header )
|
||||
{
|
||||
struct offset_stage *offset = offset_stage(stage);
|
||||
float mrd = 1.0f / 65535.0f; /* XXX this depends on depthbuffer bits! */
|
||||
|
||||
offset->units = stage->draw->rasterizer->offset_units * mrd;
|
||||
offset->units = stage->draw->rasterizer->offset_units * stage->draw->mrd;
|
||||
offset->scale = stage->draw->rasterizer->offset_scale;
|
||||
|
||||
stage->tri = offset_tri;
|
||||
|
|
|
|||
|
|
@ -172,6 +172,8 @@ struct draw_context
|
|||
|
||||
boolean force_passthrough; /**< never clip or shade */
|
||||
|
||||
double mrd; /**< minimum resolvable depth value, for polygon offset */
|
||||
|
||||
/* pipe state that we need: */
|
||||
const struct pipe_rasterizer_state *rasterizer;
|
||||
struct pipe_viewport_state viewport;
|
||||
|
|
|
|||
122
src/gallium/auxiliary/util/u_prim.h
Normal file
122
src/gallium/auxiliary/util/u_prim.h
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
||||
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
|
||||
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
#ifndef U_BLIT_H
|
||||
#define U_BLIT_H
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "pipe/p_defines.h"
|
||||
|
||||
static INLINE boolean u_validate_pipe_prim( unsigned pipe_prim, unsigned nr )
|
||||
{
|
||||
boolean ok = TRUE;
|
||||
|
||||
switch (pipe_prim) {
|
||||
case PIPE_PRIM_POINTS:
|
||||
ok = (nr >= 1);
|
||||
break;
|
||||
case PIPE_PRIM_LINES:
|
||||
ok = (nr >= 2);
|
||||
break;
|
||||
case PIPE_PRIM_LINE_STRIP:
|
||||
case PIPE_PRIM_LINE_LOOP:
|
||||
ok = (nr >= 2);
|
||||
break;
|
||||
case PIPE_PRIM_TRIANGLES:
|
||||
ok = (nr >= 3);
|
||||
break;
|
||||
case PIPE_PRIM_TRIANGLE_STRIP:
|
||||
case PIPE_PRIM_TRIANGLE_FAN:
|
||||
case PIPE_PRIM_POLYGON:
|
||||
ok = (nr >= 3);
|
||||
break;
|
||||
case PIPE_PRIM_QUADS:
|
||||
ok = (nr >= 4);
|
||||
break;
|
||||
case PIPE_PRIM_QUAD_STRIP:
|
||||
ok = (nr >= 4);
|
||||
break;
|
||||
default:
|
||||
ok = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
|
||||
static INLINE boolean u_trim_pipe_prim( unsigned pipe_prim, unsigned *nr )
|
||||
{
|
||||
boolean ok = TRUE;
|
||||
|
||||
switch (pipe_prim) {
|
||||
case PIPE_PRIM_POINTS:
|
||||
ok = (*nr >= 1);
|
||||
break;
|
||||
case PIPE_PRIM_LINES:
|
||||
ok = (*nr >= 2);
|
||||
*nr -= (*nr % 2);
|
||||
break;
|
||||
case PIPE_PRIM_LINE_STRIP:
|
||||
case PIPE_PRIM_LINE_LOOP:
|
||||
ok = (*nr >= 2);
|
||||
break;
|
||||
case PIPE_PRIM_TRIANGLES:
|
||||
ok = (*nr >= 3);
|
||||
*nr -= (*nr % 3);
|
||||
break;
|
||||
case PIPE_PRIM_TRIANGLE_STRIP:
|
||||
case PIPE_PRIM_TRIANGLE_FAN:
|
||||
case PIPE_PRIM_POLYGON:
|
||||
ok = (*nr >= 3);
|
||||
break;
|
||||
case PIPE_PRIM_QUADS:
|
||||
ok = (*nr >= 4);
|
||||
*nr -= (*nr % 4);
|
||||
break;
|
||||
case PIPE_PRIM_QUAD_STRIP:
|
||||
ok = (*nr >= 4);
|
||||
*nr -= (*nr % 2);
|
||||
break;
|
||||
default:
|
||||
ok = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!ok)
|
||||
*nr = 0;
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -101,6 +101,26 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
|
|||
}
|
||||
#endif
|
||||
|
||||
/* Tell draw module how deep the Z/depth buffer is */
|
||||
{
|
||||
int depth_bits;
|
||||
double mrd;
|
||||
if (sp->framebuffer.zsbuf) {
|
||||
depth_bits = pf_get_component_bits(sp->framebuffer.zsbuf->format,
|
||||
PIPE_FORMAT_COMP_Z);
|
||||
}
|
||||
else {
|
||||
depth_bits = 0;
|
||||
}
|
||||
if (depth_bits > 16) {
|
||||
mrd = 0.0000001;
|
||||
}
|
||||
else {
|
||||
mrd = 0.00002;
|
||||
}
|
||||
draw_set_mrd(sp->draw, mrd);
|
||||
}
|
||||
|
||||
sp->framebuffer.width = fb->width;
|
||||
sp->framebuffer.height = fb->height;
|
||||
|
||||
|
|
|
|||
|
|
@ -419,7 +419,7 @@ static XMesaVisual
|
|||
create_glx_visual( Display *dpy, XVisualInfo *visinfo )
|
||||
{
|
||||
int vislevel;
|
||||
GLint zBits = 24; /*default_depth_bits();*/
|
||||
GLint zBits = default_depth_bits();
|
||||
GLint accBits = default_accum_bits();
|
||||
GLboolean alphaFlag = default_alpha_bits() > 0;
|
||||
|
||||
|
|
@ -1289,7 +1289,7 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig )
|
|||
double_flag = GL_TRUE;
|
||||
if (vis->depth > 8)
|
||||
rgb_flag = GL_TRUE;
|
||||
depth_size = 24; /*default_depth_bits();*/
|
||||
depth_size = default_depth_bits();
|
||||
stencil_size = STENCIL_BITS;
|
||||
/* XXX accum??? */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -286,15 +286,17 @@ st_notify_swapbuffers_complete(struct st_framebuffer *stfb)
|
|||
|
||||
if (ctx && ctx->DrawBuffer == &stfb->Base) {
|
||||
struct st_renderbuffer *strb;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < BUFFER_COUNT; i++) {
|
||||
if (stfb->Base.Attachment[i].Renderbuffer) {
|
||||
strb = st_renderbuffer(stfb->Base.Attachment[i].Renderbuffer);
|
||||
if (strb->surface)
|
||||
strb->surface->status = PIPE_SURFACE_STATUS_UNDEFINED;
|
||||
}
|
||||
}
|
||||
/* Mark back color buffers as undefined */
|
||||
strb = st_renderbuffer(stfb->Base.Attachment[BUFFER_BACK_LEFT].
|
||||
Renderbuffer);
|
||||
if (strb && strb->surface)
|
||||
strb->surface->status = PIPE_SURFACE_STATUS_UNDEFINED;
|
||||
|
||||
strb = st_renderbuffer(stfb->Base.Attachment[BUFFER_BACK_RIGHT].
|
||||
Renderbuffer);
|
||||
if (strb && strb->surface)
|
||||
strb->surface->status = PIPE_SURFACE_STATUS_UNDEFINED;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue