From 92ba435bd9aa7b6eca9aef8e5193576ef62fc9db Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 26 Mar 2007 12:44:58 -0700 Subject: [PATCH 1/5] Update xorg.conf manpage for new RandR 1.2 monitor options. --- hw/xfree86/doc/man/xorg.conf.man.pre | 79 +++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 6 deletions(-) diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index bbba21112..cc60d0754 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 is off. 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 From d387a3ddf76716791e5e8b8f0954ca0df3c579d6 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 27 Mar 2007 11:00:13 +1000 Subject: [PATCH 2/5] fix loading of GLcore after recent loading changes --- hw/xfree86/dixmods/glxmodule.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c index 401707abc..5384f434b 100644 --- a/hw/xfree86/dixmods/glxmodule.c +++ b/hw/xfree86/dixmods/glxmodule.c @@ -95,8 +95,8 @@ __glXMesaProxyScreenProbe(ScreenPtr pScreen) 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; From a63ee90bc2d490f6c5c1802c164391963cf6c1d9 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 27 Mar 2007 11:05:52 +1000 Subject: [PATCH 3/5] gl: update for latest mesa glsl-compiler merge --- GL/mesa/main/Makefile.am | 1 + GL/mesa/shader/Makefile.am | 13 +++++++++---- GL/mesa/shader/slang/Makefile.am | 23 ++++++++++++----------- GL/mesa/swrast/Makefile.am | 2 -- GL/mesa/tnl/Makefile.am | 1 - 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index 20b79351e..2b838e903 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 3519545ed..abde27513 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 04001c4ba..479de6308 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -18,23 +18,24 @@ INCLUDES = -I@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 5ed657631..9a6aa92fb 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 5d9bdb1e6..84301d3d8 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 \ From b8f846a9dfc6697d59ad5482ba7c9d738875318e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 27 Mar 2007 14:17:40 +1000 Subject: [PATCH 4/5] gl: oops dodgy s appeared pointed out by jcristau on irc.. --- GL/mesa/shader/slang/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am index 479de6308..4bd48e964 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -18,8 +18,7 @@ INCLUDES = -I@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 \ From 6a0bed16e80a91891cee6c7033c90875bc2af193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 27 Mar 2007 16:51:12 +0200 Subject: [PATCH 5/5] Fix typo in GL/mesa/shader/slang/Makefile.am. --- GL/mesa/shader/slang/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am index 4bd48e964..7f0cd649e 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -37,4 +37,4 @@ nodist_libslang_la_SOURCES = slang_builtin.c \ slang_storage.c \ slang_typeinfo.c \ slang_utility.c \ - slang_variable.c + slang_vartable.c