Trivially enable extension GL_ARB_texture_env_crossbar on nv1x.
More complete piglit test is underway. Attached summary file is from run with
only -t corossbar.
name: nv11-16-09-2010-crossbar-only
glxinfo: @@@libGL: OpenDriver: trying
/mnt/hdd1/src/mesa-clean/mesa/lib/nouveau_vieux_dri.so\nMesa: Mesa 7.9-devel
DEBUG build Sep 10 2010 14:58:11\nname of display: :0.0\ndisplay: :0 screen:
0\ndirect rendering: Yes\nserver glx vendor string: SGI\nserver glx version
string: 1.4\nserver glx extensions:\n GLX_ARB_multisample,
GLX_EXT_import_context, GLX_EXT_texture_from_pixmap, \n GLX_EXT_visual_info,
GLX_EXT_visual_rating, GLX_MESA_copy_sub_buffer, \n GLX_OML_swap_method,
GLX_SGIS_multisample, GLX_SGIX_fbconfig, \n GLX_SGIX_pbuffer,
GLX_SGIX_visual_select_group, GLX_INTEL_swap_event\nclient glx vendor string:
Mesa Project and SGI\nclient glx version string: 1.4\nclient glx extensions:\n
GLX_ARB_get_proc_address, GLX_ARB_multisample, GLX_EXT_import_context, \n
GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_MESA_copy_sub_buffer, \n
GLX_MESA_swap_control, GLX_OML_swap_method, GLX_OML_sync_control, \n
GLX_SGI_make_current_read, GLX_SGI_swap_control, GLX_SGI_video_sync, \n
GLX_SGIS_multisample, GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, \n
GLX_SGIX_visual_select_group, GLX_EXT_texture_from_pixmap, \n
GLX_INTEL_swap_event\nGLX version: 1.4\nGLX extensions:\n
GLX_ARB_get_proc_address, GLX_ARB_multisample, GLX_EXT_import_context, \n
GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_MESA_copy_sub_buffer, \n
GLX_MESA_swap_control, GLX_OML_swap_method, GLX_OML_sync_control, \n
GLX_SGI_make_current_read, GLX_SGI_video_sync, GLX_SGIS_multisample, \n
GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, GLX_SGIX_visual_select_group, \n
GLX_EXT_texture_from_pixmap, GLX_INTEL_swap_event\nOpenGL vendor string:
Nouveau\nOpenGL renderer string: Mesa DRI nv11 20091015
x86/MMX+/3DNow!+\nOpenGL version string: 1.2 Mesa 7.9-devel\nOpenGL
extensions:\n GL_ARB_draw_buffers, GL_ARB_imaging, GL_ARB_multisample, \n
GL_ARB_multitexture, GL_ARB_texture_compression, GL_ARB_texture_env_add, \n
GL_ARB_texture_env_combine, GL_ARB_texture_env_crossbar, \n
GL_ARB_texture_env_dot3, GL_ARB_texture_mirrored_repeat, \n
GL_ARB_texture_rectangle, GL_ARB_transpose_matrix, \n
GL_ARB_vertex_buffer_object, GL_ARB_window_pos, GL_EXT_abgr, GL_EXT_bgra, \n
GL_EXT_blend_color, GL_EXT_blend_logic_op, GL_EXT_blend_minmax, \n
GL_EXT_blend_subtract, GL_EXT_compiled_vertex_array, GL_EXT_convolution, \n
GL_EXT_copy_texture, GL_EXT_draw_range_elements, GL_EXT_framebuffer_blit, \n
GL_EXT_framebuffer_object, GL_EXT_fog_coord, GL_EXT_histogram, \n
GL_EXT_multi_draw_arrays, GL_EXT_packed_depth_stencil, \n
GL_EXT_packed_pixels, GL_EXT_polygon_offset, GL_EXT_rescale_normal, \n
GL_EXT_secondary_color, GL_EXT_separate_specular_color, \n
GL_EXT_stencil_wrap, GL_EXT_subtexture, GL_EXT_texture, GL_EXT_texture3D, \n
GL_EXT_texture_edge_clamp, GL_EXT_texture_env_add, \n
GL_EXT_texture_env_combine, GL_EXT_texture_lod_bias, \n
GL_EXT_texture_object, GL_EXT_texture_rectangle, GL_EXT_vertex_array, \n
GL_APPLE_packed_pixels, GL_IBM_multimode_draw_arrays, \n
GL_IBM_rasterpos_clip, GL_IBM_texture_mirrored_repeat, GL_MESA_window_pos, \n
GL_NV_blend_square, GL_NV_light_max_exponent, GL_NV_packed_depth_stencil, \n
GL_NV_texgen_reflection, GL_NV_texture_env_combine4, \n
GL_NV_texture_rectangle, GL_OES_read_format, GL_SGI_color_matrix, \n
GL_SGI_color_table, GL_SGIS_generate_mipmap, GL_SGIS_texture_edge_clamp, \n
GL_SGIS_texture_lod, GL_SUN_multi_draw_arrays\n\n visual x bf lv rg d st
colorbuffer ax dp st accumbuffer ms cav\n id dep cl sp sz l ci b ro r g b
a bf th cl r g b a ns b
eat\n----------------------------------------------------------------------\n0x21
24 tc 0 32 0 r y . 8 8 8 8 0 24 8 0 0 0 0 0 0 None\n0x22 24 dc
0 32 0 r y . 8 8 8 8 0 24 8 0 0 0 0 0 0 None\n0xc9 24 tc 0 32 0
r . . 8 8 8 8 0 0 0 0 0 0 0 0 0 None\n0xca 24 tc 0 32 0 r . .
8 8 8 8 0 0 0 16 16 16 16 0 0 Slow\n0xcb 24 tc 0 32 0 r y . 8 8
8 8 0 0 0 0 0 0 0 0 0 None\n0xcc 24 tc 0 32 0 r y . 8 8 8 8 0
0 0 16 16 16 16 0 0 Slow\n0xcd 24 tc 0 32 0 r . . 8 8 8 8 0 16 0
0 0 0 0 0 0 None\n0xce 24 tc 0 32 0 r . . 8 8 8 8 0 16 0 16 16 16
16 0 0 Slow\n0xcf 24 tc 0 32 0 r y . 8 8 8 8 0 16 0 16 16 16 16 0 0
Slow\n0xd0 24 tc 0 32 0 r . . 8 8 8 8 0 24 0 0 0 0 0 0 0
None\n0xd1 24 tc 0 32 0 r . . 8 8 8 8 0 24 0 16 16 16 16 0 0
Slow\n0xd2 24 tc 0 32 0 r y . 8 8 8 8 0 24 0 0 0 0 0 0 0
None\n0xd3 24 tc 0 32 0 r y . 8 8 8 8 0 24 0 16 16 16 16 0 0
Slow\n0xd4 24 tc 0 32 0 r . . 8 8 8 8 0 24 8 0 0 0 0 0 0
None\n0xd5 24 tc 0 32 0 r . . 8 8 8 8 0 24 8 16 16 16 16 0 0
Slow\n0xd6 24 tc 0 32 0 r y . 8 8 8 8 0 24 8 16 16 16 16 0 0
Slow\n0xd7 24 tc 0 24 0 r . . 8 8 8 0 0 0 0 0 0 0 0 0 0
None\n0xd8 24 tc 0 24 0 r . . 8 8 8 0 0 0 0 16 16 16 0 0 0
Slow\n0xd9 24 tc 0 24 0 r y . 8 8 8 0 0 0 0 0 0 0 0 0 0
None\n0xda 24 tc 0 24 0 r y . 8 8 8 0 0 0 0 16 16 16 0 0 0
Slow\n0xdb 24 tc 0 24 0 r . . 8 8 8 0 0 16 0 0 0 0 0 0 0
None\n0xdc 24 tc 0 24 0 r . . 8 8 8 0 0 16 0 16 16 16 0 0 0
Slow\n0xdd 24 tc 0 24 0 r y . 8 8 8 0 0 16 0 0 0 0 0 0 0
None\n0xde 24 tc 0 24 0 r y . 8 8 8 0 0 16 0 16 16 16 0 0 0
Slow\n0xdf 24 tc 0 24 0 r . . 8 8 8 0 0 24 0 0 0 0 0 0 0
None\n0xe0 24 tc 0 24 0 r . . 8 8 8 0 0 24 0 16 16 16 0 0 0
Slow\n0xe1 24 tc 0 24 0 r y . 8 8 8 0 0 24 0 0 0 0 0 0 0
None\n0xe2 24 tc 0 24 0 r y . 8 8 8 0 0 24 0 16 16 16 0 0 0
Slow\n0xe3 24 tc 0 24 0 r . . 8 8 8 0 0 24 8 0 0 0 0 0 0
None\n0xe4 24 tc 0 24 0 r . . 8 8 8 0 0 24 8 16 16 16 0 0 0
Slow\n0xe5 24 tc 0 24 0 r y . 8 8 8 0 0 24 8 0 0 0 0 0 0
None\n0xe6 24 tc 0 24 0 r y . 8 8 8 0 0 24 8 16 16 16 0 0 0
Slow\n0xe7 24 dc 0 32 0 r . . 8 8 8 8 0 0 0 0 0 0 0 0 0
None\n0xe8 24 dc 0 32 0 r . . 8 8 8 8 0 0 0 16 16 16 16 0 0
Slow\n0xe9 24 dc 0 32 0 r y . 8 8 8 8 0 0 0 0 0 0 0 0 0
None\n0xea 24 dc 0 32 0 r y . 8 8 8 8 0 0 0 16 16 16 16 0 0
Slow\n0xeb 24 dc 0 32 0 r . . 8 8 8 8 0 16 0 0 0 0 0 0 0
None\n0xec 24 dc 0 32 0 r . . 8 8 8 8 0 16 0 16 16 16 16 0 0
Slow\n0xed 24 dc 0 32 0 r y . 8 8 8 8 0 16 0 0 0 0 0 0 0
None\n0xee 24 dc 0 32 0 r y . 8 8 8 8 0 16 0 16 16 16 16 0 0
Slow\n0xef 24 dc 0 32 0 r . . 8 8 8 8 0 24 0 0 0 0 0 0 0
None\n0xf0 24 dc 0 32 0 r . . 8 8 8 8 0 24 0 16 16 16 16 0 0
Slow\n0xf1 24 dc 0 32 0 r y . 8 8 8 8 0 24 0 0 0 0 0 0 0
None\n0xf2 24 dc 0 32 0 r y . 8 8 8 8 0 24 0 16 16 16 16 0 0
Slow\n0xf3 24 dc 0 32 0 r . . 8 8 8 8 0 24 8 0 0 0 0 0 0
None\n0xf4 24 dc 0 32 0 r . . 8 8 8 8 0 24 8 16 16 16 16 0 0
Slow\n0xf5 24 dc 0 32 0 r y . 8 8 8 8 0 24 8 16 16 16 16 0 0
Slow\n0xf6 24 dc 0 24 0 r . . 8 8 8 0 0 0 0 0 0 0 0 0 0
None\n0xf7 24 dc 0 24 0 r . . 8 8 8 0 0 0 0 16 16 16 0 0 0
Slow\n0xf8 24 dc 0 24 0 r y . 8 8 8 0 0 0 0 0 0 0 0 0 0
None\n0xf9 24 dc 0 24 0 r y . 8 8 8 0 0 0 0 16 16 16 0 0 0
Slow\n0xfa 24 dc 0 24 0 r . . 8 8 8 0 0 16 0 0 0 0 0 0 0
None\n0xfb 24 dc 0 24 0 r . . 8 8 8 0 0 16 0 16 16 16 0 0 0
Slow\n0xfc 24 dc 0 24 0 r y . 8 8 8 0 0 16 0 0 0 0 0 0 0
None\n0xfd 24 dc 0 24 0 r y . 8 8 8 0 0 16 0 16 16 16 0 0 0
Slow\n0xfe 24 dc 0 24 0 r . . 8 8 8 0 0 24 0 0 0 0 0 0 0
None\n0xff 24 dc 0 24 0 r . . 8 8 8 0 0 24 0 16 16 16 0 0 0
Slow\n0x100 24 dc 0 24 0 r y . 8 8 8 0 0 24 0 0 0 0 0 0 0
None\n0x101 24 dc 0 24 0 r y . 8 8 8 0 0 24 0 16 16 16 0 0 0
Slow\n0x102 24 dc 0 24 0 r . . 8 8 8 0 0 24 8 0 0 0 0 0 0
None\n0x103 24 dc 0 24 0 r . . 8 8 8 0 0 24 8 16 16 16 0 0 0
Slow\n0x104 24 dc 0 24 0 r y . 8 8 8 0 0 24 8 0 0 0 0 0 0
None\n0x105 24 dc 0 24 0 r y . 8 8 8 0 0 24 8 16 16 16 0 0 0
Slow\n0x68 32 tc 0 32 0 r y . 8 8 8 8 0 16 0 0 0 0 0 0 0 None\n
lspci: @@@Failed to run lspci
time: 0.346499919891
@test: mesa/crossbar
errors_ignored!
libGL: OpenDriver: trying
/mnt/hdd1/src/mesa-clean/mesa/lib/nouveau_vieux_dri.so
Mesa: Mesa 7.9-devel DEBUG build Sep 10 2010 14:58:11
!
info: @@@Returncode: 0\n\nErrors:\nlibGL: OpenDriver: trying
/mnt/hdd1/src/mesa-clean/mesa/lib/nouveau_vieux_dri.so\nMesa: Mesa 7.9-devel
DEBUG build Sep 10 2010 14:58:11\n\n\nOutput:\nGL_RENDERER = Mesa DRI nv11
20091015 x86/MMX+/3DNow!+\nGL_VERSION = 1.2 Mesa 7.9-devel\n\nFirst
frame\n-----------\nProbe 0: 0.501961,0.501961,0.501961\n Delta:
0.001961,0.001961,0.001961\nProbe 1: 0.498039,0.498039,0.498039\n Delta:
-0.001961,-0.001961,-0.001961\nProbe 2: 0.501961,0.501961,0.501961\n Delta:
0.001961,0.001961,0.001961\nProbe 3: 0.498039,0.498039,0.498039\n Delta:
-0.001961,-0.001961,-0.001961\nProbe 4: 0.498039,0.498039,0.498039\n Delta:
-0.001961,-0.001961,-0.001961\nProbe 5: 0.498039,0.498039,0.498039\n Delta:
-0.001961,-0.001961,-0.001961\nProbe 6: 0.494118,0.494118,0.494118\n Delta:
-0.005882,-0.005882,-0.005882\nMax delta: 0.005882\n\nSecond
frame\n------------\nProbe 0: 0.501961,0.501961,0.501961\n Delta:
0.001961,0.001961,0.001961\nProbe 1: 0.498039,0.498039,0.498039\n Delta:
-0.001961,-0.001961,-0.001961\nProbe 2: 0.501961,0.501961,0.501961\n Delta:
0.001961,0.001961,0.001961\nProbe 3: 0.498039,0.498039,0.498039\n Delta:
-0.001961,-0.001961,-0.001961\nProbe 4: 0.498039,0.498039,0.498039\n Delta:
-0.001961,-0.001961,-0.001961\nProbe 5: 0.498039,0.498039,0.498039\n Delta:
-0.001961,-0.001961,-0.001961\nProbe 6: 0.494118,0.494118,0.494118\n Delta:
-0.005882,-0.005882,-0.005882\nMax delta: 0.005882\n\n
returncode: 0
result: pass
time: 0.265281915665
!
From 009e6c9e609ce8e2464f66f1c6d8ba70be29fa0c Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <randrianas...@gmail.com>
Date: Thu, 16 Sep 2010 17:33:00 +0400
Subject: [PATCH] nv10: Reindent nv10 extension list, add GL_ARB_texture_env_crossbar,
passes piglit crossbar test. I don't have nv20 for test with.
---
src/mesa/drivers/dri/nouveau/nv10_context.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c
index 7f00002..70c4843 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_context.c
@@ -33,10 +33,11 @@
#include "nv10_driver.h"
static const struct dri_extension nv10_extensions[] = {
- { "GL_EXT_texture_rectangle", NULL },
- { "GL_ARB_texture_env_combine", NULL },
- { "GL_ARB_texture_env_dot3", NULL },
- { NULL, NULL }
+ { "GL_EXT_texture_rectangle", NULL },
+ { "GL_ARB_texture_env_combine", NULL },
+ { "GL_ARB_texture_env_crossbar", NULL },
+ { "GL_ARB_texture_env_dot3", NULL },
+ { NULL, NULL }
};
static void
--
1.7.0.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
