projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r128
/
r128_context.h
diff --git
a/src/mesa/drivers/dri/r128/r128_context.h
b/src/mesa/drivers/dri/r128/r128_context.h
index 7bf853da39ca798c1af039a21697e232c71b8fbc..0a06c43878d515a2ce73fee5e47a4962634f868f 100644
(file)
--- a/
src/mesa/drivers/dri/r128/r128_context.h
+++ b/
src/mesa/drivers/dri/r128/r128_context.h
@@
-39,7
+39,7
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "drm.h"
#include "r128_drm.h"
#include "drm.h"
#include "r128_drm.h"
-#include "mtypes.h"
+#include "m
ain/m
types.h"
#include "tnl/t_vertex.h"
#include "r128_reg.h"
#include "tnl/t_vertex.h"
#include "r128_reg.h"
@@
-113,7
+113,7
@@
typedef void (*r128_point_func)( r128ContextPtr,
struct r128_context {
struct r128_context {
-
GL
context *glCtx; /* Mesa context */
+
struct gl_
context *glCtx; /* Mesa context */
/* Driver and hardware state management
*/
/* Driver and hardware state management
*/
@@
-186,9
+186,9
@@
struct r128_context {
/* Mirrors of some DRI state
*/
/* Mirrors of some DRI state
*/
- __DRIcontext
Private
*driContext; /* DRI context */
- __DRIscreen
Private
*driScreen; /* DRI screen */
- __DRIdrawable
Private
*driDrawable; /* DRI drawable bound to this ctx */
+ __DRIcontext
*driContext; /* DRI context */
+ __DRIscreen *driScreen; /* DRI screen */
+ __DRIdrawable *driDrawable; /* DRI drawable bound to this ctx */
unsigned int lastStamp; /* mirror driDrawable->lastStamp */
unsigned int lastStamp; /* mirror driDrawable->lastStamp */
@@
-224,17
+224,18
@@
struct r128_context {
(rmesa->r128Screen->chipset == R128_CARD_TYPE_R128_MOBILITY)
(rmesa->r128Screen->chipset == R128_CARD_TYPE_R128_MOBILITY)
-extern GLboolean r128CreateContext( const __GLcontextModes *glVisual,
- __DRIcontextPrivate *driContextPriv,
+extern GLboolean r128CreateContext( gl_api api,
+ const struct gl_config *glVisual,
+ __DRIcontext *driContextPriv,
void *sharedContextPrivate );
void *sharedContextPrivate );
-extern void r128DestroyContext( __DRIcontext
Private
* );
+extern void r128DestroyContext( __DRIcontext * );
-extern GLboolean r128MakeCurrent( __DRIcontext
Private
*driContextPriv,
- __DRIdrawable
Private
*driDrawPriv,
- __DRIdrawable
Private
*driReadPriv );
+extern GLboolean r128MakeCurrent( __DRIcontext *driContextPriv,
+ __DRIdrawable *driDrawPriv,
+ __DRIdrawable *driReadPriv );
-extern GLboolean r128UnbindContext( __DRIcontext
Private
*driContextPriv );
+extern GLboolean r128UnbindContext( __DRIcontext *driContextPriv );
/* ================================================================
* Debugging:
/* ================================================================
* Debugging: