projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i810
/
i810context.c
diff --git
a/src/mesa/drivers/dri/i810/i810context.c
b/src/mesa/drivers/dri/i810/i810context.c
index f90b3682f83832084cb5491b10859f1fb41f03f0..7311b2e76549ad9d335f23fe253c5ace6cfb3fd9 100644
(file)
--- a/
src/mesa/drivers/dri/i810/i810context.c
+++ b/
src/mesa/drivers/dri/i810/i810context.c
@@
-32,14
+32,14
@@
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
*/
-#include "glheader.h"
-#include "context.h"
-#include "matrix.h"
-#include "simple_list.h"
-#include "extensions.h"
-#include "framebuffer.h"
-#include "imports.h"
-#include "points.h"
+#include "
main/
glheader.h"
+#include "
main/
context.h"
+#include "ma
in/ma
trix.h"
+#include "
main/
simple_list.h"
+#include "
main/
extensions.h"
+#include "
main/
framebuffer.h"
+#include "
main/
imports.h"
+#include "
main/
points.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
@@
-63,11
+63,6
@@
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "drirenderbuffer.h"
#include "utils.h"
#include "drirenderbuffer.h"
#include "utils.h"
-#define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
-#define need_GL_ARB_vertex_buffer_object
-#include "extension_helper.h"
-
#ifndef I810_DEBUG
int I810_DEBUG = (0);
#endif
#ifndef I810_DEBUG
int I810_DEBUG = (0);
#endif
@@
-121,16
+116,13
@@
static void i810BufferSize(GLframebuffer *buffer, GLuint *width, GLuint *height)
/* Extension strings exported by the i810 driver.
*/
/* Extension strings exported by the i810 driver.
*/
-const struct dri_extension card_extensions[] =
+
static
const struct dri_extension card_extensions[] =
{
{
- { "GL_ARB_multisample", GL_ARB_multisample_functions },
{ "GL_ARB_multitexture", NULL },
{ "GL_ARB_multitexture", NULL },
- { "GL_ARB_texture_compression", GL_ARB_texture_compression_functions },
{ "GL_ARB_texture_env_add", NULL },
{ "GL_ARB_texture_env_combine", NULL },
{ "GL_ARB_texture_env_crossbar", NULL },
{ "GL_ARB_texture_mirrored_repeat", NULL },
{ "GL_ARB_texture_env_add", NULL },
{ "GL_ARB_texture_env_combine", NULL },
{ "GL_ARB_texture_env_crossbar", NULL },
{ "GL_ARB_texture_mirrored_repeat", NULL },
- { "GL_ARB_vertex_buffer_object", GL_ARB_vertex_buffer_object_functions },
{ "GL_EXT_stencil_wrap", NULL },
{ "GL_EXT_texture_edge_clamp", NULL },
{ "GL_EXT_texture_env_combine", NULL },
{ "GL_EXT_stencil_wrap", NULL },
{ "GL_EXT_texture_edge_clamp", NULL },
{ "GL_EXT_texture_env_combine", NULL },
@@
-423,11
+415,11
@@
void i810XMesaSetBackClipRects( i810ContextPtr imesa )
static void i810XMesaWindowMoved( i810ContextPtr imesa )
{
/* Determine current color drawing buffer */
static void i810XMesaWindowMoved( i810ContextPtr imesa )
{
/* Determine current color drawing buffer */
- switch (imesa->glCtx->DrawBuffer->_ColorDrawBuffer
Mask
[0]) {
- case BUFFER_
BIT_
FRONT_LEFT:
+ switch (imesa->glCtx->DrawBuffer->_ColorDrawBuffer
Indexes
[0]) {
+ case BUFFER_FRONT_LEFT:
i810XMesaSetFrontClipRects( imesa );
break;
i810XMesaSetFrontClipRects( imesa );
break;
- case BUFFER_B
IT_B
ACK_LEFT:
+ case BUFFER_BACK_LEFT:
i810XMesaSetBackClipRects( imesa );
break;
default:
i810XMesaSetBackClipRects( imesa );
break;
default:
@@
-485,11
+477,11
@@
i810UpdatePageFlipping( i810ContextPtr imesa )
int front = 0;
/* Determine current color drawing buffer */
int front = 0;
/* Determine current color drawing buffer */
- switch (ctx->DrawBuffer->_ColorDrawBuffer
Mask
[0]) {
- case BUFFER_
BIT_
FRONT_LEFT:
+ switch (ctx->DrawBuffer->_ColorDrawBuffer
Indexes
[0]) {
+ case BUFFER_FRONT_LEFT:
front = 1;
break;
front = 1;
break;
- case BUFFER_B
IT_B
ACK_LEFT:
+ case BUFFER_BACK_LEFT:
front = 0;
break;
default:
front = 0;
break;
default: