xserver: Branch 'XACE-SELINUX' - 6 commits
Eamon Walsh
ewalsh at kemper.freedesktop.org
Tue Mar 27 23:18:46 EEST 2007
GL/mesa/main/Makefile.am | 1
GL/mesa/shader/Makefile.am | 13 +++--
GL/mesa/shader/slang/Makefile.am | 22 ++++-----
GL/mesa/swrast/Makefile.am | 2
GL/mesa/tnl/Makefile.am | 1
hw/xfree86/dixmods/glxmodule.c | 4 -
hw/xfree86/doc/man/xorg.conf.man.pre | 79 ++++++++++++++++++++++++++++++++---
7 files changed, 96 insertions(+), 26 deletions(-)
New commits:
diff-tree 728ad64d979fd9e5cca28e8c15118c18d707c431 (from parents)
Merge: 0331c6a8fcba1dc27ef45aaf5f694799d0085413 6a0bed16e80a91891cee6c7033c90875bc2af193
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Mar 27 13:16:40 2007 -0400
Merge branch 'master' into XACE-SELINUX
diff-tree 6a0bed16e80a91891cee6c7033c90875bc2af193 (from b8f846a9dfc6697d59ad5482ba7c9d738875318e)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Tue Mar 27 16:51:12 2007 +0200
Fix typo in GL/mesa/shader/slang/Makefile.am.
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index 4bd48e9..7f0cd64 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -37,4 +37,4 @@ nodist_libslang_la_SOURCES = slang_built
slang_storage.c \
slang_typeinfo.c \
slang_utility.c \
- slang_variable.c
+ slang_vartable.c
diff-tree b8f846a9dfc6697d59ad5482ba7c9d738875318e (from a63ee90bc2d490f6c5c1802c164391963cf6c1d9)
Author: Dave Airlie <airlied at linux.ie>
Date: Tue Mar 27 14:17:40 2007 +1000
gl: oops dodgy s appeared pointed out by jcristau on irc..
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index 479de63..4bd48e9 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -18,8 +18,7 @@ INCLUDES = -I at MESA_SOURCE@/include \
-I../.. \
-I$(top_srcdir)/hw/xfree86/os-support
-nodist_libslang_la_SOURCES = s
- slang_builtin.c \
+nodist_libslang_la_SOURCES = slang_builtin.c \
slang_codegen.c \
slang_compile.c \
slang_compile_function.c \
diff-tree a63ee90bc2d490f6c5c1802c164391963cf6c1d9 (from d387a3ddf76716791e5e8b8f0954ca0df3c579d6)
Author: Dave Airlie <airlied at pegasus.(none)>
Date: Tue Mar 27 11:05:52 2007 +1000
gl: update for latest mesa glsl-compiler merge
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index 20b7935..2b838e9 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -68,6 +68,7 @@ nodist_libmain_la_SOURCES = accum.c \
rastpos.c \
rbadaptors.c \
renderbuffer.c \
+ shaders.c \
state.c \
stencil.c \
texcompress.c \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index 3519545..abde275 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -27,8 +27,13 @@ nodist_libshader_la_SOURCES = \
atifragshader.c \
nvfragparse.c \
nvprogram.c \
- nvvertexec.c \
- nvvertparse.c \
+ nvvertparse.c \
+ prog_debug.c \
+ prog_execute.c \
+ prog_instruction.c \
+ prog_parameter.c \
+ prog_print.c \
program.c \
- shaderobjects.c \
- shaderobjects_3dlabs.c
+ programopt.c \
+ prog_statevars.c \
+ shader_api.c
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index 04001c4..479de63 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -18,23 +18,24 @@ INCLUDES = -I at MESA_SOURCE@/include \
-I../.. \
-I$(top_srcdir)/hw/xfree86/os-support
-nodist_libslang_la_SOURCES = slang_analyse.c \
- slang_assemble_assignment.c \
- slang_assemble.c \
- slang_assemble_conditional.c \
- slang_assemble_constructor.c \
- slang_assemble_typeinfo.c \
+nodist_libslang_la_SOURCES = s
+ slang_builtin.c \
+ slang_codegen.c \
slang_compile.c \
slang_compile_function.c \
slang_compile_operation.c \
slang_compile_struct.c \
slang_compile_variable.c \
- slang_execute.c \
- slang_execute_x86.c \
- slang_export.c \
- slang_library_texsample.c \
+ slang_emit.c \
+ slang_ir.c \
+ slang_label.c \
slang_library_noise.c \
slang_link.c \
+ slang_log.c \
slang_preprocess.c \
+ slang_print.c \
+ slang_simplify.c \
slang_storage.c \
- slang_utility.c
+ slang_typeinfo.c \
+ slang_utility.c \
+ slang_variable.c
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index 5ed6576..9a6aa92 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -23,7 +23,6 @@ nodist_libswrast_la_SOURCES = s_aaline.c
s_aatriangle.c \
s_accum.c \
s_alpha.c \
- s_arbshader.c \
s_atifragshader.c \
s_bitmap.c \
s_blend.c \
@@ -39,7 +38,6 @@ nodist_libswrast_la_SOURCES = s_aaline.c
s_lines.c \
s_logic.c \
s_masking.c \
- s_nvfragprog.c \
s_points.c \
s_readpix.c \
s_span.c \
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index 5d9bdb1..84301d3 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -23,7 +23,6 @@ nodist_libtnl_la_SOURCES = t_context.c \
t_pipeline.c \
t_vb_arbprogram.c \
t_vb_arbprogram_sse.c \
- t_vb_arbshader.c \
t_vb_cull.c \
t_vb_fog.c \
t_vb_light.c \
diff-tree d387a3ddf76716791e5e8b8f0954ca0df3c579d6 (from 92ba435bd9aa7b6eca9aef8e5193576ef62fc9db)
Author: Dave Airlie <airlied at pegasus.(none)>
Date: Tue Mar 27 11:00:13 2007 +1000
fix loading of GLcore after recent loading changes
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 401707a..5384f43 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -95,8 +95,8 @@ __glXMesaProxyScreenProbe(ScreenPtr pScr
static __GLXprovider *provider;
if (provider == NULL) {
- GLcore = LoadSubModuleLocal(glxModule, "GLcore", NULL, NULL, NULL, NULL,
- NULL, NULL);
+ GLcore = LoadSubModule(glxModule, "GLcore", NULL, NULL, NULL, NULL,
+ NULL, NULL);
if (GLcore == NULL)
return NULL;
diff-tree 92ba435bd9aa7b6eca9aef8e5193576ef62fc9db (from f7c5aa0dc0fa3569a2ee412c4f996960f936b6ed)
Author: Eric Anholt <eric at anholt.net>
Date: Mon Mar 26 12:44:58 2007 -0700
Update xorg.conf manpage for new RandR 1.2 monitor options.
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index bbba211..cc60d07 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1004,12 +1004,22 @@ The
.B Identifier
entry specifies the unique name for this monitor. The
.B Monitor
-section provides information about the specifications of the monitor,
-monitor-specific
+section may be used to provide information about the specifications of the
+monitor, monitor-specific
.BR Options ,
-and information about the video modes to use with the monitor. Specifying
-video modes is optional because the server now has a built-in list of
-VESA standard modes. When modes are specified explicitly in the
+and information about the video modes to use with the monitor.
+.PP
+With RandR 1.2-enabled drivers, monitor sections are tied to specific outputs
+of the video card. Each output has a name, and the server will look for a
+Monitor named
+.B \*qMonitor-outputname\*q
+for configuration of that output (for example,
+.B \*qMonitor-VGA\*q
+for a VGA output)
+.PP
+Specifying video modes is optional because the server will use the DDC or other
+information provided by the monitor to automatically configure the list of
+modes available. When modes are specified explicitly in the
.B Monitor
section (with the
.BR Modes ,
@@ -1017,7 +1027,8 @@ section (with the
or
.B UseModes
keywords), built-in modes with the same names are not included. Built-in
-modes with different names are, however, still implicitly included.
+modes with different names are, however, still implicitly included, when they
+meet the requirements of the monitor.
.PP
The entries that may be used in
.B Monitor
@@ -1214,6 +1225,62 @@ monitors do not require it. The default
This optional entry specifies the vertical refresh rate that the server
should aim for when selecting video modes. Without this option, the
default is to prefer modes with higher refresh rates.
+.TP 7
+.BI "Option " "\*qPreferredMode\*q " \*qstring\*q
+This optional entry specifies a mode to be marked as the preferred initial mode
+of the monitor.
+(RandR 1.2-supporting drivers only)
+.TP 7
+.BI "Option " "\*qPosition\*q " "\*qx y\*q"
+This optional entry specifies the position of the monitor within the X
+screen.
+(RandR 1.2-supporting drivers only)
+.TP 7
+.BI "Option " "\*qLeftOf\*q " \*qmonitor\*q
+This optional entry specifies that the monitor should be positioned to the
+left of the monitor of the given name.
+(RandR 1.2-supporting drivers only)
+.TP 7
+.BI "Option " "\*qRightOf\*q " \*qmonitor\*q
+This optional entry specifies that the monitor should be positioned to the
+right of the monitor of the given name.
+(RandR 1.2-supporting drivers only)
+.TP 7
+.BI "Option " "\*qAbove\*q " \*qmonitor\*q
+This optional entry specifies that the monitor should be positioned above the
+monitor of the given name.
+(RandR 1.2-supporting drivers only)
+.TP 7
+.BI "Option " "\*qBelow\*q " \*qmonitor\*q
+This optional entry specifies that the monitor should be positioned below the
+monitor of the given name.
+(RandR 1.2-supporting drivers only)
+.TP 7
+.BI "Option " "\*qEnable\*q " \*qbool\*q
+This optional entry specifies whether the monitor should be turned on
+at startup. By default, the server will attempt to enable all connected
+monitors.
+(RandR 1.2-supporting drivers only)
+.TP 7
+.BI "Option " "\*qMinClock\*q " \*qfrequency\*q
+This optional entry specifies the minimum dot clock, in kHz, that is supported
+by the monitor.
+.TP 7
+.BI "Option " "\*qMaxClock\*q " \*qfrequency\*q
+This optional entry specifies the maximum dot clock, in kHz, that is supported
+by the monitor.
+.TP 7
+.BI "Option " "\*qIgnore\*q " \*qbool\*q
+This optional entry specifies that the monitor should be ignored entirely,
+and not reported through RandR. This is useful if the hardware reports the
+presence of outputs that don't exist.
+(RandR 1.2-supporting drivers only)
+.TP 7
+.BI "Option " "\*qRotate\*q " \*qrotation\*q
+This optional entry specifies the initial rotation of the given monitor.
+Valid values for rotation are \*qnormal\*q, \*qleft\*q, \*qright\*q, and
+\*qinverted\*q.
+(RandR 1.2-supporting drivers only)
.SH MODES SECTION
The config file may have multiple
More information about the xorg-commit
mailing list