projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8' into master
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_context.c
diff --git
a/src/mesa/state_tracker/st_context.c
b/src/mesa/state_tracker/st_context.c
index e978415c20078a6fcb7c5843394021da7d37fa38..0885ad77c7c9db616edc56b7f5b06006ba93f970 100644
(file)
--- a/
src/mesa/state_tracker/st_context.c
+++ b/
src/mesa/state_tracker/st_context.c
@@
-30,9
+30,9
@@
#include "vbo/vbo.h"
#include "shader/shader_api.h"
#include "glapi/glapi.h"
#include "vbo/vbo.h"
#include "shader/shader_api.h"
#include "glapi/glapi.h"
+#include "st_context.h"
#include "st_public.h"
#include "st_debug.h"
#include "st_public.h"
#include "st_debug.h"
-#include "st_context.h"
#include "st_cb_accum.h"
#include "st_cb_bitmap.h"
#include "st_cb_blit.h"
#include "st_cb_accum.h"
#include "st_cb_bitmap.h"
#include "st_cb_blit.h"
@@
-287,7
+287,7
@@
st_make_current(struct st_context *st,
}
_mesa_check_init_viewport(st->ctx, draw->InitWidth, draw->InitHeight);
}
_mesa_check_init_viewport(st->ctx, draw->InitWidth, draw->InitHeight);
- st->
pipe->priv
= winsys_drawable_handle;
+ st->
winsys_drawable_handle
= winsys_drawable_handle;
return GL_TRUE;
}
return GL_TRUE;
}