xserver: Branch 'xgl-0-0-1' - 5 commits
David Reveman
davidr at kemper.freedesktop.org
Mon Mar 5 17:47:32 EET 2007
GL/glx/glxutil.h | 4 ---
GL/glx/indirect_dispatch.c | 2 -
GL/mesa/Makefile.am | 4 +--
GL/mesa/array_cache/Makefile.am | 2 -
GL/mesa/tnl/Makefile.am | 14 ++---------
GL/symlink-mesa.sh | 50 +++++++++++++++++++++-------------------
hw/xgl/glxext/xglglxext.c | 21 ++++++++++++++++
hw/xgl/glxext/xglglxlog.c | 21 ++++++++++++++++
8 files changed, 74 insertions(+), 44 deletions(-)
New commits:
diff-tree b3be2542fa5e3cf563307fa19941b8fcb3cc003b (from parents)
Merge: af798037d7622d02152206d580ebe626fada5b90 fb38acaabe4540f2c956ada77515f0ec269430f1
Author: David Reveman <davidr at novell.com>
Date: Mon Mar 5 10:46:38 2007 +0100
Merge branch 'xgl-0-0-1' of git+ssh://git.freedesktop.org/git/xorg/xserver into xgl-0-0-1
diff-tree af798037d7622d02152206d580ebe626fada5b90 (from 88c98d216c78224cd0a48856f42a88565e8b7f68)
Author: David Reveman <davidr at novell.com>
Date: Mon Mar 5 10:18:23 2007 +0100
Sync with mesa.
diff --git a/hw/xgl/glxext/xglglxext.c b/hw/xgl/glxext/xglglxext.c
index c4f0274..7d65d81 100644
--- a/hw/xgl/glxext/xglglxext.c
+++ b/hw/xgl/glxext/xglglxext.c
@@ -4315,9 +4315,28 @@ static struct _glapi_table __glNativeRen
xglNoOpMultiTexCoord4ivARB,
0, /* glMultiTexCoord4sARB */
xglNoOpMultiTexCoord4svARB,
+ 0, /* glAttachShader */
+ 0, /* glCreateProgram */
+ 0, /* glCreateShader */
+ 0, /* glDeleteProgram */
+ 0, /* glDeleteShader */
+ 0, /* glDetachShader */
+ 0, /* glGetAttachedShaders */
+ 0, /* glGetProgramInfoLog */
+ 0, /* glGetProgramiv */
+ 0, /* glGetShaderInfoLog */
+ 0, /* glGetShaderiv */
+ 0, /* glIsProgram */
+ 0, /* glIsShader */
0, /* glStencilFuncSeparate */
- 0, /* glStencilOpSeparate */
0, /* glStencilMaskSeparate */
+ 0, /* glStencilOpSeparate */
+ 0, /* glUniformMatrix2x3fv */
+ 0, /* glUniformMatrix2x4fv */
+ 0, /* glUniformMatrix3x2fv */
+ 0, /* glUniformMatrix3x4fv */
+ 0, /* glUniformMatrix4x2fv */
+ 0, /* glUniformMatrix4x3fv */
0, /* glLoadTransposeMatrixfARB */
0, /* glLoadTransposeMatrixdARB */
0, /* glMultTransposeMatrixfARB */
diff --git a/hw/xgl/glxext/xglglxlog.c b/hw/xgl/glxext/xglglxlog.c
index d0a6ba6..dca2c0c 100644
--- a/hw/xgl/glxext/xglglxlog.c
+++ b/hw/xgl/glxext/xglglxlog.c
@@ -4379,9 +4379,28 @@ static struct _glapi_table __logRenderTa
logMultiTexCoord4ivARB,
0, /* glMultiTexCoord4sARB */
logMultiTexCoord4svARB,
+ 0, /* glAttachShader */
+ 0, /* glCreateProgram */
+ 0, /* glCreateShader */
+ 0, /* glDeleteProgram */
+ 0, /* glDeleteShader */
+ 0, /* glDetachShader */
+ 0, /* glGetAttachedShaders */
+ 0, /* glGetProgramInfoLog */
+ 0, /* glGetProgramiv */
+ 0, /* glGetShaderInfoLog */
+ 0, /* glGetShaderiv */
+ 0, /* glIsProgram */
+ 0, /* glIsShader */
0, /* glStencilFuncSeparate */
- 0, /* glStencilOpSeparate */
0, /* glStencilMaskSeparate */
+ 0, /* glStencilOpSeparate */
+ 0, /* glUniformMatrix2x3fv */
+ 0, /* glUniformMatrix2x4fv */
+ 0, /* glUniformMatrix3x2fv */
+ 0, /* glUniformMatrix3x4fv */
+ 0, /* glUniformMatrix4x2fv */
+ 0, /* glUniformMatrix4x3fv */
0, /* glLoadTransposeMatrixfARB */
0, /* glLoadTransposeMatrixdARB */
0, /* glMultTransposeMatrixfARB */
diff-tree 88c98d216c78224cd0a48856f42a88565e8b7f68 (from 31e391a20c552e786e95156fab300224dbab431c)
Author: David Reveman <davidr at novell.com>
Date: Mon Mar 5 10:17:28 2007 +0100
Remove __glXResizeDrawable and __glXGetDrawableSize.
diff --git a/GL/glx/glxutil.h b/GL/glx/glxutil.h
index d5cfa20..9c2e96e 100644
--- a/GL/glx/glxutil.h
+++ b/GL/glx/glxutil.h
@@ -48,10 +48,6 @@ extern void __glXAssociateContext(__GLXc
extern void __glXDeassociateContext(__GLXcontext *glxc);
/* drawable operation */
-extern void __glXGetDrawableSize(__GLdrawablePrivate *glPriv,
- GLint *x, GLint *y,
- GLuint *width, GLuint *height);
-extern GLboolean __glXResizeDrawable(__GLdrawablePrivate *glPriv);
extern GLboolean __glXResizeDrawableBuffers(__GLXdrawable *glxPriv);
/* drawable management */
diff-tree 31e391a20c552e786e95156fab300224dbab431c (from d73ac5ab285a4cf4c7568c27952e8a9e8ff155d3)
Author: David Reveman <davidr at novell.com>
Date: Mon Mar 5 10:15:28 2007 +0100
DeleteTextures is not a vendor private request.
diff --git a/GL/glx/indirect_dispatch.c b/GL/glx/indirect_dispatch.c
index 8e22396..4d7ed33 100644
--- a/GL/glx/indirect_dispatch.c
+++ b/GL/glx/indirect_dispatch.c
@@ -2815,7 +2815,7 @@ int __glXDisp_DeleteTextures(__GLXclient
int error;
__GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
- pc += __GLX_VENDPRIV_HDR_SIZE;
+ pc += __GLX_SINGLE_HDR_SIZE;
if ( cx != NULL ) {
const GLsizei n = *(GLsizei *)(pc + 0);
diff-tree d73ac5ab285a4cf4c7568c27952e8a9e8ff155d3 (from 7958dee1c60aadb36077fb4fa89d63f668759fb6)
Author: David Reveman <davidr at novell.com>
Date: Mon Mar 5 10:14:03 2007 +0100
Sync with mesa.
diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am
index 18eebfc..4f225da 100644
--- a/GL/mesa/Makefile.am
+++ b/GL/mesa/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
+SUBDIRS = main math vbo swrast swrast_setup tnl shader X glapi
noinst_LTLIBRARIES = libGLcore.la
libGLcore_la_SOURCES = dummy.c
libGLcore_la_LIBADD = main/libmain.la \
math/libmath.la \
- array_cache/libac.la \
+ vbo/libvbo.la \
swrast/libswrast.la \
swrast_setup/libss.la \
tnl/libtnl.la \
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index 4ff6da1..0374b7c 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -15,4 +15,4 @@ INCLUDES = -I at MESA_SOURCE@/include \
-I.. \
-I$(top_srcdir)/hw/xfree86/os-support
-nodist_libac_la_SOURCES = ac_context.c ac_import.c
+nodist_libac_la_SOURCES =
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index a8b57bc..b9546ed 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -16,13 +16,10 @@ INCLUDES = -I at MESA_SOURCE@/include \
-I.. \
-I$(top_srcdir)/hw/xfree86/os-support
-nodist_libtnl_la_SOURCES = t_array_api.c \
- t_array_import.c \
+nodist_libtnl_la_SOURCES = \
+ t_draw.c \
t_context.c \
t_pipeline.c \
- t_save_api.c \
- t_save_loopback.c \
- t_save_playback.c \
t_vb_arbprogram.c \
t_vb_arbprogram_sse.c \
t_vb_arbshader.c \
@@ -39,9 +36,4 @@ nodist_libtnl_la_SOURCES = t_array_api.c
t_vertex.c \
t_vertex_generic.c \
t_vertex_sse.c \
- t_vp_build.c \
- t_vtx_api.c \
- t_vtx_eval.c \
- t_vtx_exec.c \
- t_vtx_generic.c \
- t_vtx_x86.c
+ t_vp_build.c
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 014812e..5745e36 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -238,14 +238,31 @@ symlink_mesa_math() {
action mathmod.h
}
-symlink_mesa_ac() {
- src_dir src/mesa/array_cache
- dst_dir mesa/array_cache
-
- action ac_context.c
- action ac_context.h
- action ac_import.c
- action acache.h
+symlink_mesa_vbo() {
+ src_dir src/mesa/vbo
+ dst_dir mesa/vbo
+
+ action vbo.h
+ action vbo_attrib.h
+ action vbo_attrib_tmp.h
+ action vbo_context.c
+ action vbo_context.h
+ action vbo_exec.c
+ action vbo_exec.h
+ action vbo_exec_api.c
+ action vbo_exec_array.c
+ action vbo_exec_draw.c
+ action vbo_exec_eval.c
+ action vbo_rebase.c
+ action vbo_split.c
+ action vbo_split.h
+ action vbo_split_copy.c
+ action vbo_split_inplace.c
+ action vbo_save.c
+ action vbo_save.h
+ action vbo_save_api.c
+ action vbo_save_draw.c
+ action vbo_save_loopback.c
}
symlink_mesa_swrast() {
@@ -332,18 +349,11 @@ symlink_mesa_tnl() {
src_dir src/mesa/tnl
dst_dir mesa/tnl
- action t_array_api.c
- action t_array_api.h
- action t_array_import.c
- action t_array_import.h
action t_context.c
+ action t_draw.c
action t_context.h
action t_pipeline.c
action t_pipeline.h
- action t_save_api.c
- action t_save_api.h
- action t_save_loopback.c
- action t_save_playback.c
action t_vb_arbprogram.c
action t_vb_arbprogram.h
action t_vb_arbprogram_sse.c
@@ -367,12 +377,6 @@ symlink_mesa_tnl() {
action t_vertex_sse.c
action t_vp_build.c
action t_vp_build.h
- action t_vtx_api.c
- action t_vtx_api.h
- action t_vtx_eval.c
- action t_vtx_exec.c
- action t_vtx_generic.c
- action t_vtx_x86.c
action tnl.h
}
@@ -523,7 +527,7 @@ symlink_mesa_x8664() {
symlink_mesa() {
symlink_mesa_main
symlink_mesa_math
- symlink_mesa_ac
+ symlink_mesa_vbo
symlink_mesa_swrast
symlink_mesa_ss
symlink_mesa_tnl
More information about the xorg-commit
mailing list