From f71afa039b901e09d6957d2e1e72d70a28921fbd Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Tue, 12 Feb 2008 21:29:01 -0800 Subject: 171.05 --- samples/nv-control-events.c | 1 + src/gtk+-2.x/ctkevent.c | 1 + src/gtk+-2.x/ctkpowermizer.c | 11 +++++++++++ src/libXNVCtrl/NVCtrl.h | 9 +++++++-- src/libXNVCtrl/libXNVCtrl.a | Bin 17180 -> 17180 bytes src/parse.c | 1 + 6 files changed, 21 insertions(+), 2 deletions(-) diff --git a/samples/nv-control-events.c b/samples/nv-control-events.c index 102a16b..1f40fed 100644 --- a/samples/nv-control-events.c +++ b/samples/nv-control-events.c @@ -435,6 +435,7 @@ static const char *attr2str(int n) case NV_CTRL_REFRESH_RATE: return "refresh rate"; break; case NV_CTRL_CURRENT_SCANLINE: return "current scanline"; break; case NV_CTRL_INITIAL_PIXMAP_PLACEMENT: return "initial pixmap placement"; break; + case NV_CTRL_GLYPH_CACHE: return "glyph cache"; break; case NV_CTRL_PCI_BUS: return "pci bus"; break; case NV_CTRL_PCI_DEVICE: return "pci device"; break; case NV_CTRL_PCI_FUNCTION: return "pci function"; break; diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c index edcffc4..fb0483b 100644 --- a/src/gtk+-2.x/ctkevent.c +++ b/src/gtk+-2.x/ctkevent.c @@ -223,6 +223,7 @@ static void ctk_event_class_init(CtkEventClass *ctk_event_class) MAKE_SIGNAL(NV_CTRL_PROBE_DISPLAYS); MAKE_SIGNAL(NV_CTRL_REFRESH_RATE); MAKE_SIGNAL(NV_CTRL_INITIAL_PIXMAP_PLACEMENT); + MAKE_SIGNAL(NV_CTRL_GLYPH_CACHE); MAKE_SIGNAL(NV_CTRL_PCI_BUS); MAKE_SIGNAL(NV_CTRL_PCI_DEVICE); MAKE_SIGNAL(NV_CTRL_PCI_FUNCTION); diff --git a/src/gtk+-2.x/ctkpowermizer.c b/src/gtk+-2.x/ctkpowermizer.c index 3768b50..f25e1b1 100644 --- a/src/gtk+-2.x/ctkpowermizer.c +++ b/src/gtk+-2.x/ctkpowermizer.c @@ -70,6 +70,13 @@ static const char *__memory_clock_freq_help = static const char *__clock_freq_help = "This indicates the current GPU Clock and Memory Clock frequencies."; +static const char *__performance_levels_table_help = +"This indicates the Performance Levels available for the GPU. Each " +"performance level is indicated by a Performance Level number, along with " +"the GPU and Memory clocks for that level. The currently active performance " +"level is shown in regular text. All other performance levels are shown in " +"gray."; + GType ctk_powermizer_get_type(void) { static GType ctk_powermizer_type = 0; @@ -610,6 +617,10 @@ GtkTextBuffer *ctk_powermizer_create_help(GtkTextTagTable *table, ctk_help_para(b, &i, __performance_mode_help); ctk_help_finish(b); + ctk_help_heading(b, &i, "Performance Levels (Table)"); + ctk_help_para(b, &i, __performance_levels_table_help); + ctk_help_finish(b); + return b; } diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h index 13398aa..bd031a3 100644 --- a/src/libXNVCtrl/NVCtrl.h +++ b/src/libXNVCtrl/NVCtrl.h @@ -3080,8 +3080,6 @@ #define NV_CTRL_NUM_GPU_ERRORS_RECOVERED 259 /* R--- */ - - /* * NV_CTRL_ONDEMAND_VBLANK_INTERRUPTS - if the OnDemandVBlankInterrupts * X driver option is set to true, this attribute can be used to @@ -3116,6 +3114,13 @@ #define NV_CTRL_GPU_CURRENT_PERFORMANCE_MODE_MAXPERF 1 +/* NV_CTRL_GLYPH_CACHE - Enables RENDER Glyph Caching to VRAM */ + +#define NV_CTRL_GLYPH_CACHE 264 /* RW- */ +#define NV_CTRL_GLYPH_CACHE_DISABLED 0 +#define NV_CTRL_GLYPH_CACHE_ENABLED 1 + + /* * NV_CTRL_GPU_CURRENT_PERFORMANCE_LEVEL reports the current * Performance level of the GPU driving the X screen. Each diff --git a/src/libXNVCtrl/libXNVCtrl.a b/src/libXNVCtrl/libXNVCtrl.a index 16d29e6..f02dff0 100644 Binary files a/src/libXNVCtrl/libXNVCtrl.a and b/src/libXNVCtrl/libXNVCtrl.a differ diff --git a/src/parse.c b/src/parse.c index ce0f7d8..9e71944 100644 --- a/src/parse.c +++ b/src/parse.c @@ -109,6 +109,7 @@ AttributeTableEntry attributeTable[] = { { "LogAnisoAppControlled", NV_CTRL_LOG_ANISO_APPLICATION_CONTROLLED,0 }, { "RefreshRate", NV_CTRL_REFRESH_RATE, N|H }, { "InitialPixmapPlacement",NV_CTRL_INITIAL_PIXMAP_PLACEMENT, N }, + { "GlyphCache", NV_CTRL_GLYPH_CACHE, N }, { "PCIBus", NV_CTRL_PCI_BUS, N }, { "PCIDevice", NV_CTRL_PCI_DEVICE, N }, { "PCIFunc", NV_CTRL_PCI_FUNCTION, N }, -- cgit v1.2.3