diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-07 17:16:10 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-07 17:16:10 -0800 |
commit | 8fc433fa0f8c5364454858f9be919387feda440c (patch) | |
tree | ec4fd82af464123acbef1f16212aa44e8f9fddd1 /src/mesa/drivers/dri/radeon/radeon_common.h | |
parent | bb64c9bcdf9962c4f74d71f49307de1da4c3392b (diff) | |
parent | 9dbd47fc6b1cf9ddfb318f2e05df0886cd5fe0df (diff) |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
progs/demos/projtex.c
progs/xdemos/glxinfo.c
src/mesa/main/version.h
To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_common.h')
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common.h b/src/mesa/drivers/dri/radeon/radeon_common.h index def0cc17a9..0608fe2418 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.h +++ b/src/mesa/drivers/dri/radeon/radeon_common.h @@ -10,7 +10,6 @@ void radeonRecalcScissorRects(radeonContextPtr radeon); void radeonSetCliprects(radeonContextPtr radeon); void radeonUpdateScissor( GLcontext *ctx ); void radeonScissor(GLcontext* ctx, GLint x, GLint y, GLsizei w, GLsizei h); -void radeonPolygonStipplePreKMS( GLcontext *ctx, const GLubyte *mask ); void radeonWaitForIdleLocked(radeonContextPtr radeon); extern uint32_t radeonGetAge(radeonContextPtr radeon); |