[Mesa-dev] [PATCH] automake: use -m32 in CCASFLAGS when using --enable-32-bit
this fixes libdricore directory build with --enable-32-bit on a x86_64 system Signed-off-by: Tapani Pälli tapani.pa...@intel.com --- configure.ac |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 9fb8149..cb96d46 100644 --- a/configure.ac +++ b/configure.ac @@ -271,6 +271,7 @@ if test x$enable_32bit = xyes; then if test x$GCC = xyes; then CFLAGS=$CFLAGS -m32 ARCH_FLAGS=$ARCH_FLAGS -m32 + CCASFLAGS=$CCASFLAGS -m32 fi if test x$GXX = xyes; then CXXFLAGS=$CXXFLAGS -m32 -- 1.7.7.6 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Fw: [Intel-gfx] [PATCH] intel: add a timed wait function
On Thu, May 31, 2012 at 12:35 AM, Eric Anholt e...@anholt.net wrote: Did you want pointer for timeout in the userspace api? I don't feel strongly about it, I just didn't see a use. The equivalent API I could think of was select(), where apparently linux returns time unwaited, while everyone else doesn't. I don't see a strong recommendation either way from that. I wanted the kernel to return the unwaited time (or at least a upper bound to it, with coarse clocks that's the best we can do) so that ioctl restarting after a signal does the right thing. Exposing that any further than libdrm doesn't make much sense imo. -Daniel -- Daniel Vetter daniel.vet...@ffwll.ch - +41 (0) 79 364 57 48 - http://blog.ffwll.ch ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 0/6] add YUYV format for dri image support
Intel SNB/IVB platform supports rendering YUYV buffer to overlay plane, however YUYV is missing support from mesa/dri-image yet. so I go ahead to add it; basing on it, libva can send YUYV buffer directly to wayland/weston, then weston output it to overlay plane. I notice that there are some patches from Gwenole for YUV planar texture support. these patches have little to do with that. because: YUYV is packed format, it doesn't require additional attribute like buffer layout (introduced by Gwenole) YUYV is introduced for overlay support, no shaders for texture is required. Zhao halley (6): GL: add YUYV to dri image format mesa intel driver: egl wayland: add YUYV support gallium egl wayland: add YUYV support gbm dri backend: add YUYV support wayland-drm: add YUYV support include/GL/internal/dri_interface.h|1 + src/egl/drivers/dri2/egl_dri2.c| 17 ++--- src/egl/drivers/dri2/platform_wayland.c|8 +++- src/egl/wayland/wayland-drm/wayland-drm.c |1 + .../state_trackers/egl/wayland/native_drm.c|3 +++ .../state_trackers/egl/wayland/native_wayland.h|3 ++- src/gbm/backends/dri/gbm_dri.c |3 +++ src/mesa/drivers/dri/intel/intel_screen.c |5 + src/mesa/drivers/dri/intel/intel_tex_image.c |3 +++ 9 files changed, 39 insertions(+), 5 deletions(-) mode change 100644 = 100755 include/GL/internal/dri_interface.h mode change 100644 = 100755 src/egl/drivers/dri2/egl_dri2.c mode change 100644 = 100755 src/egl/drivers/dri2/platform_wayland.c mode change 100644 = 100755 src/egl/wayland/wayland-drm/wayland-drm.c mode change 100644 = 100755 src/gallium/state_trackers/egl/wayland/native_drm.c mode change 100644 = 100755 src/gallium/state_trackers/egl/wayland/native_wayland.h mode change 100644 = 100755 src/gbm/backends/dri/gbm_dri.c mode change 100644 = 100755 src/mesa/drivers/dri/intel/intel_screen.c mode change 100644 = 100755 src/mesa/drivers/dri/intel/intel_tex_image.c -- 1.7.5.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/6] GL: add YUYV to dri image format
--- include/GL/internal/dri_interface.h |1 + 1 files changed, 1 insertions(+), 0 deletions(-) mode change 100644 = 100755 include/GL/internal/dri_interface.h diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h old mode 100644 new mode 100755 index e37917e..5e325cf --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -907,6 +907,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_FORMAT_ARGB 0x1003 #define __DRI_IMAGE_FORMAT_ABGR 0x1004 #define __DRI_IMAGE_FORMAT_XBGR 0x1005 +#define __DRI_IMAGE_FORMAT_YUYV 0x1006 #define __DRI_IMAGE_USE_SHARE 0x0001 #define __DRI_IMAGE_USE_SCANOUT0x0002 -- 1.7.5.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 2/6] mesa intel driver:
add YUYV format for dri image YUYV image doesn't use for texture --- src/mesa/drivers/dri/intel/intel_screen.c|5 + src/mesa/drivers/dri/intel/intel_tex_image.c |3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) mode change 100644 = 100755 src/mesa/drivers/dri/intel/intel_screen.c mode change 100644 = 100755 src/mesa/drivers/dri/intel/intel_tex_image.c diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c old mode 100644 new mode 100755 index 458178f..5ff2e49 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -216,6 +216,11 @@ intel_create_image_from_name(__DRIscreen *screen, image-internal_format = GL_RGB; image-data_type = GL_UNSIGNED_BYTE; break; +case __DRI_IMAGE_FORMAT_YUYV: + image-format = MESA_FORMAT_YCBCR; // no detailed YUV format in mesa yet + image-internal_format = GL_LUMINANCE; // no detailed YUV format in gles2 yet + image-data_type = GL_UNSIGNED_BYTE; + break; default: free(image); return NULL; diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c old mode 100644 new mode 100755 index 094d3cd..e5c3bdc --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -388,6 +388,9 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target, if (image == NULL) return; + if (image-format == MESA_FORMAT_YCBCR) +return; + intel_set_texture_image_region(ctx, texImage, image-region, target, image-internal_format, image-format); } -- 1.7.5.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 3/6] egl wayland: add YUYV support
--- src/egl/drivers/dri2/egl_dri2.c | 17 ++--- src/egl/drivers/dri2/platform_wayland.c |8 +++- 2 files changed, 21 insertions(+), 4 deletions(-) mode change 100644 = 100755 src/egl/drivers/dri2/egl_dri2.c mode change 100644 = 100755 src/egl/drivers/dri2/platform_wayland.c diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c old mode 100644 new mode 100755 index 4a02838..a058046 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1096,9 +1096,15 @@ dri2_create_image_wayland_wl_buffer(_EGLDisplay *disp, _EGLContext *ctx, switch (wayland_drm_buffer_get_format(buffer)) { case WL_DRM_FORMAT_ARGB: format = __DRI_IMAGE_FORMAT_ARGB; + pitch = stride / 4; break; case WL_DRM_FORMAT_XRGB: format = __DRI_IMAGE_FORMAT_XRGB; + pitch = stride / 4; + break; + case WL_DRM_FORMAT_YUYV: + format = __DRI_IMAGE_FORMAT_YUYV; + pitch = stride / 2; break; default: _eglError(EGL_BAD_PARAMETER, @@ -1106,8 +1112,6 @@ dri2_create_image_wayland_wl_buffer(_EGLDisplay *disp, _EGLContext *ctx, return NULL; } - pitch = stride / 4; - return dri2_create_image_drm_name(disp, ctx, name, attrs, format, pitch); } #endif @@ -1270,21 +1274,28 @@ dri2_wl_reference_buffer(void *user_data, uint32_t name, struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); __DRIimage *image; int dri_format; + int pitch = 0; switch (format) { case WL_DRM_FORMAT_ARGB: dri_format =__DRI_IMAGE_FORMAT_ARGB; + pitch = stride/4; break; case WL_DRM_FORMAT_XRGB: dri_format = __DRI_IMAGE_FORMAT_XRGB; + pitch = stride/4; break; + case WL_DRM_FORMAT_YUYV: + dri_format = __DRI_IMAGE_FORMAT_YUYV; + pitch = stride/2; + break; default: return NULL; } image = dri2_dpy-image-createImageFromName(dri2_dpy-dri_screen, width, height, - dri_format, name, stride / 4, + dri_format, name, pitch, NULL); return image; diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c old mode 100644 new mode 100755 index d291f0f..6d330b7 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -42,7 +42,9 @@ enum wl_drm_format_flags { HAS_ARGB = 1, - HAS_XRGB = 2 + HAS_XRGB = (1 1), + HAS_YUYV = (1 2) + }; static void @@ -778,6 +780,9 @@ drm_handle_format(void *data, struct wl_drm *drm, uint32_t format) case WL_DRM_FORMAT_XRGB: dri2_dpy-formats |= HAS_XRGB; break; + case WL_DRM_FORMAT_YUYV: + dri2_dpy-formats |= HAS_YUYV; + break; } } @@ -878,6 +883,7 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp) dri2_add_config(disp, config, i + 1, 0, types, NULL, rgb_masks); if (dri2_dpy-formats HAS_ARGB) dri2_add_config(disp, config, i + 1, 0, types, NULL, argb_masks); + // , should we do something for YUYV here? } disp-Extensions.KHR_image_pixmap = EGL_TRUE; -- 1.7.5.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 4/6] gallium egl wayland: add YUYV support
--- .../state_trackers/egl/wayland/native_drm.c|3 +++ .../state_trackers/egl/wayland/native_wayland.h|3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) mode change 100644 = 100755 src/gallium/state_trackers/egl/wayland/native_drm.c mode change 100644 = 100755 src/gallium/state_trackers/egl/wayland/native_wayland.h diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl/wayland/native_drm.c old mode 100644 new mode 100755 index e3bd628..f2d2e74 --- a/src/gallium/state_trackers/egl/wayland/native_drm.c +++ b/src/gallium/state_trackers/egl/wayland/native_drm.c @@ -164,6 +164,9 @@ drm_handle_format(void *data, struct wl_drm *drm, uint32_t format) case WL_DRM_FORMAT_XRGB: drmdpy-base.formats |= HAS_XRGB; break; + case WL_DRM_FORMAT_YUYV: + drmdpy-base.formats |= HAS_YUYV; + break; } } diff --git a/src/gallium/state_trackers/egl/wayland/native_wayland.h b/src/gallium/state_trackers/egl/wayland/native_wayland.h old mode 100644 new mode 100755 index e6a914f..bd26bf0 --- a/src/gallium/state_trackers/egl/wayland/native_wayland.h +++ b/src/gallium/state_trackers/egl/wayland/native_wayland.h @@ -38,7 +38,8 @@ struct wayland_surface; enum wayland_format_flag { HAS_ARGB= (1 0), - HAS_XRGB= (1 1) + HAS_XRGB= (1 1), + HAS_YUYV= (1 2) }; struct wayland_display { -- 1.7.5.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 5/6] gbm dri backend: add YUYV support
--- src/gbm/backends/dri/gbm_dri.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) mode change 100644 = 100755 src/gbm/backends/dri/gbm_dri.c diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c old mode 100644 new mode 100755 index e5ddfb6..cefcc1a --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -331,6 +331,9 @@ gbm_dri_to_gbm_format(uint32_t dri_format) case __DRI_IMAGE_FORMAT_ABGR: ret = GBM_FORMAT_ABGR; break; + case __DRI_IMAGE_FORMAT_YUYV: + ret = GBM_FORMAT_YUYV; + break; default: ret = 0; break; -- 1.7.5.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 6/6] wayland-drm: add YUYV support
--- src/egl/wayland/wayland-drm/wayland-drm.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) mode change 100644 = 100755 src/egl/wayland/wayland-drm/wayland-drm.c diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c old mode 100644 new mode 100755 index 5f831b3..eea3610 --- a/src/egl/wayland/wayland-drm/wayland-drm.c +++ b/src/egl/wayland/wayland-drm/wayland-drm.c @@ -111,6 +111,7 @@ drm_create_buffer(struct wl_client *client, struct wl_resource *resource, switch (format) { case WL_DRM_FORMAT_ARGB: case WL_DRM_FORMAT_XRGB: +case WL_DRM_FORMAT_YUYV: break; default: wl_resource_post_error(resource, -- 1.7.5.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [Bug 50482] git mesa fails to build
https://bugs.freedesktop.org/show_bug.cgi?id=50482 Jos van Wolput wol...@onsneteindhoven.nl changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Jos van Wolput wol...@onsneteindhoven.nl 2012-05-31 04:17:40 PDT --- (In reply to comment #1) No more build failure with the latest git-151bf6e. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] configure.ac: Enable building nouveau by default
Signed-off-by: Maarten Lankhorst m.b.lankho...@gmail.com --- diff --git a/configure.ac b/configure.ac index 9fb8149..30f895c 100644 --- a/configure.ac +++ b/configure.ac @@ -660,7 +660,7 @@ AC_ARG_ENABLE([gallium_tests], [enable_gallium_tests=no]) # Option for Gallium drivers -GALLIUM_DRIVERS_DEFAULT=r300,r600,svga,swrast +GALLIUM_DRIVERS_DEFAULT=r300,r600,nouveau,svga,swrast AC_ARG_WITH([gallium-drivers], [AS_HELP_STRING([--with-gallium-drivers@:@=DIRS...@:@], ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] softpipe: Fix everything that is wrong with clipping and interpolation.
On 05/30/2012 03:31 PM, Olivier Galibert wrote: This includes: - picking up correctly which attributes are flatshaded and which are noperspective - copying the flatshaded attributes when needed, including the non-built-in ones - correctly interpolating the noperspective attributes in screen-space instead than in a 3d-correct fashion. Signed-off-by: Olivier Galibertgalib...@pobox.com --- src/gallium/auxiliary/draw/draw_pipe_clip.c | 144 +-- 1 file changed, 113 insertions(+), 31 deletions(-) I've kicked the f_nopersp computation up so that it's always evaluated, and I've added a bunch of comments. Every generated interpolation test in piglit pass for both softpipe and llvmpipe at that point (after forcing llvmpipe to GLSL 1.30 of course). diff --git a/src/gallium/auxiliary/draw/draw_pipe_clip.c b/src/gallium/auxiliary/draw/draw_pipe_clip.c index 4da4d65..2d36eb3 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_clip.c +++ b/src/gallium/auxiliary/draw/draw_pipe_clip.c @@ -39,6 +39,7 @@ #include draw_vs.h #include draw_pipe.h +#include draw_fs.h #ifndef IS_NEGATIVE @@ -56,11 +57,12 @@ struct clip_stage { struct draw_stage stage; /** base class */ - /* Basically duplicate some of the flatshading logic here: -*/ - boolean flat; - uint num_color_attribs; - uint color_attribs[4]; /* front/back primary/secondary colors */ + /* List of the attributes to be flatshaded. */ + uint num_flat_attribs; + uint flat_attribs[PIPE_MAX_SHADER_OUTPUTS]; + + /* Mask of attributes in noperspective mode */ + boolean noperspective_attribs[PIPE_MAX_SHADER_OUTPUTS]; float (*plane)[4]; }; @@ -91,17 +93,16 @@ static void interp_attr( float dst[4], /** - * Copy front/back, primary/secondary colors from src vertex to dst vertex. - * Used when flat shading. + * Copy flat shaded attributes src vertex to dst vertex. */ -static void copy_colors( struct draw_stage *stage, -struct vertex_header *dst, -const struct vertex_header *src ) +static void copy_flat( struct draw_stage *stage, + struct vertex_header *dst, + const struct vertex_header *src ) { const struct clip_stage *clipper = clip_stage(stage); uint i; - for (i = 0; i clipper-num_color_attribs; i++) { - const uint attr = clipper-color_attribs[i]; + for (i = 0; i clipper-num_flat_attribs; i++) { + const uint attr = clipper-flat_attribs[i]; COPY_4FV(dst-data[attr], src-data[attr]); } } @@ -120,6 +121,7 @@ static void interp( const struct clip_stage *clip, const unsigned pos_attr = draw_current_shader_position_output(clip-stage.draw); const unsigned clip_attr = draw_current_shader_clipvertex_output(clip-stage.draw); unsigned j; + float t_nopersp; /* Vertex header. */ @@ -148,12 +150,36 @@ static void interp( const struct clip_stage *clip, dst-data[pos_attr][2] = pos[2] * oow * scale[2] + trans[2]; dst-data[pos_attr][3] = oow; } + + /** +* Compute the t in screen-space instead of 3d space to use +* for noperspective interpolation. +* +* The points can be aligned with the X axis, so in that case try +* the Y. When both points are at the same screen position, we can +* pick whatever value (the interpolated point won't be in front +* anyway), so just use the 3d t. +*/ + { + int k; + t_nopersp = t; + for (k = 0; k 2; k++) + if (in-data[pos_attr][k] != out-data[pos_attr][k]) { +t_nopersp = (dst-data[pos_attr][k] - out-data[pos_attr][k]) / + (in-data[pos_attr][k] - out-data[pos_attr][k]); +break; + } + } /* Other attributes */ for (j = 0; j nr_attrs; j++) { - if (j != pos_attr j != clip_attr) -interp_attr(dst-data[j], t, in-data[j], out-data[j]); + if (j != pos_attr j != clip_attr) { + if (clip-noperspective_attribs[j]) +interp_attr(dst-data[j], t_nopersp, in-data[j], out-data[j]); + else +interp_attr(dst-data[j], t, in-data[j], out-data[j]); + } } } @@ -406,14 +432,14 @@ do_clip_tri( struct draw_stage *stage, /* If flat-shading, copy provoking vertex color to polygon vertex[0] */ if (n= 3) { - if (clipper-flat) { + if (clipper-num_flat_attribs) { if (stage-draw-rasterizer-flatshade_first) { if (inlist[0] != header-v[0]) { assert(tmpnr MAX_CLIPPED_VERTICES + 1); if (tmpnr= MAX_CLIPPED_VERTICES + 1) return; inlist[0] = dup_vert(stage, inlist[0], tmpnr++); - copy_colors(stage, inlist[0], header-v[0]); + copy_flat(stage, inlist[0], header-v[0]); } } else { @@ -422,7 +448,7 @@ do_clip_tri( struct draw_stage *stage,
[Mesa-dev] [Bug 45292] Compilation failure on d3d1x state tracker: ‘ID3D10Include’ has not been declared
https://bugs.freedesktop.org/show_bug.cgi?id=45292 Phr33d0m shi...@v-gz.cz.cc changed: What|Removed |Added CC||shi...@v-gz.cz.cc -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [Bug 9272] glXDestroyContext causes fatal error when sharing display lists (dri)
https://bugs.freedesktop.org/show_bug.cgi?id=9272 Ian Romanick i...@freedesktop.org changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #2 from Ian Romanick i...@freedesktop.org 2012-05-31 14:18:03 PDT --- Does this bug still occur? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] intel: Change vendor string to Intel® Open Source Technology Center.
Tungsten Graphics has not existed for several years, and the majority of ongoing development and support is done by Intel. I chose to include Open Source Technology Center to distinguish it from, say, the closed source Windows OpenGL driver. The one downside to this patch is that applications that pattern match against Intel may start applying workarounds meant for the Windows driver. However, it does seem like the right thing to do. This does change oglconform behavior. Acked-by: Eric Anholt e...@anholt.net Acked-by: Ian Romanick ian.d.roman...@intel.com Cc: Eugeni Dodonov eug...@dodonov.net Signed-off-by: Kenneth Graunke kenn...@whitecape.org --- src/mesa/drivers/dri/intel/intel_context.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 9deb4ca..712acb8 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -72,7 +72,7 @@ intelGetString(struct gl_context * ctx, GLenum name) switch (name) { case GL_VENDOR: - return (GLubyte *) Tungsten Graphics, Inc; + return (GLubyte *) Intel® Open Source Technology Center; break; case GL_RENDERER: -- 1.7.10.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] intel: Change vendor string to Intel(R) Open Source Technology Center.
On Fri, Jun 1, 2012 at 1:19 AM, Kenneth Graunke kenn...@whitecape.org wrote: Tungsten Graphics has not existed for several years, and the majority of ongoing development and support is done by Intel. I chose to include Open Source Technology Center to distinguish it from, say, the closed source Windows OpenGL driver. The one downside to this patch is that applications that pattern match against Intel may start applying workarounds meant for the Windows driver. However, it does seem like the right thing to do. This does change oglconform behavior. Acked-by: Eric Anholt e...@anholt.net Acked-by: Ian Romanick ian.d.roman...@intel.com Cc: Eugeni Dodonov eug...@dodonov.net Signed-off-by: Kenneth Graunke kenn...@whitecape.org --- src/mesa/drivers/dri/intel/intel_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 9deb4ca..712acb8 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -72,7 +72,7 @@ intelGetString(struct gl_context * ctx, GLenum name) switch (name) { case GL_VENDOR: - return (GLubyte *) Tungsten Graphics, Inc; + return (GLubyte *) Intel® Open Source Technology Center; break; Uhm... isn't ® a character outside the ASCII range ? Some compiles might choke on this, i.e. the Sun Workshop/Forte/Studio compilers require -xcsi (... This option allows the C compiler to accept source code written in locales that do not conform to the ISO C source character code requirements. These locales include ja_JP.PCK ...) to avoid occasional hiccups. Bye, Roland -- __ . . __ (o.\ \/ /.o) roland.ma...@nrubsig.org \__\/\/__/ MPEG specialist, CJAVASunUnix programmer /O /==\ O\ TEL +49 641 3992797 (;O/ \/ \O;) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] intel: Change vendor string to Intel(R) Open Source Technology Center.
On 05/31/12 04:28 PM, Roland Mainz wrote: On Fri, Jun 1, 2012 at 1:19 AM, Kenneth Graunke kenn...@whitecape.org wrote: switch (name) { case GL_VENDOR: - return (GLubyte *) Tungsten Graphics, Inc; + return (GLubyte *) Intel® Open Source Technology Center; break; Uhm... isn't ® a character outside the ASCII range ? Some compiles might choke on this, i.e. the Sun Workshop/Forte/Studio compilers require -xcsi (... This option allows the C compiler to accept source code written in locales that do not conform to the ISO C source character code requirements. These locales include ja_JP.PCK ...) to avoid occasional hiccups. I don't remember having any problems with the Studio compilers using UTF-8 characters, but they do break down if you use other encodings that appear to cause invalid UTF-8 sequences. -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] intel: Change vendor string to Intel(R) Open Source Technology Center.
On Fri, Jun 1, 2012 at 1:34 AM, Alan Coopersmith alan.coopersm...@oracle.com wrote: On 05/31/12 04:28 PM, Roland Mainz wrote: On Fri, Jun 1, 2012 at 1:19 AM, Kenneth Graunke kenn...@whitecape.org wrote: switch (name) { case GL_VENDOR: - return (GLubyte *) Tungsten Graphics, Inc; + return (GLubyte *) Intel® Open Source Technology Center; break; Uhm... isn't ® a character outside the ASCII range ? Some compiles might choke on this, i.e. the Sun Workshop/Forte/Studio compilers require -xcsi (... This option allows the C compiler to accept source code written in locales that do not conform to the ISO C source character code requirements. These locales include ja_JP.PCK ...) to avoid occasional hiccups. I don't remember having any problems with the Studio compilers using UTF-8 characters, Technically they shouldn't... but I still remember being chased around (oh... yes... I lively remember *THAT* ... *shudder* ... the teeth... these horrible t...[1]) by Sun's ON gatekeeper for causing the occasional one in 100 random build failures until we figured out that we need to add -xcsi (see http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/Makefile.ast#73). [1]=Yes, yes... I'm joking a bit... :-) but they do break down if you use other encodings that appear to cause invalid UTF-8 sequences. s/invalid UTF-8 sequence/invalid multibyte sequences/ The code works as long you either use the C, POSIX or an UTF-8-based locale but any other encoding scheme (like GB18030) will likely cause a build failure. Bye, Roland -- __ . . __ (o.\ \/ /.o) roland.ma...@nrubsig.org \__\/\/__/ MPEG specialist, CJAVASunUnix programmer /O /==\ O\ TEL +49 641 3992797 (;O/ \/ \O;) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] intel: Change vendor string to Intel(R) Open Source Technology Center.
On 05/31/2012 04:28 PM, Roland Mainz wrote: On Fri, Jun 1, 2012 at 1:19 AM, Kenneth Graunkekenn...@whitecape.org wrote: Tungsten Graphics has not existed for several years, and the majority of ongoing development and support is done by Intel. I chose to include Open Source Technology Center to distinguish it from, say, the closed source Windows OpenGL driver. The one downside to this patch is that applications that pattern match against Intel may start applying workarounds meant for the Windows driver. However, it does seem like the right thing to do. This does change oglconform behavior. Acked-by: Eric Anholte...@anholt.net Acked-by: Ian Romanickian.d.roman...@intel.com Cc: Eugeni Dodonoveug...@dodonov.net Signed-off-by: Kenneth Graunkekenn...@whitecape.org --- src/mesa/drivers/dri/intel/intel_context.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 9deb4ca..712acb8 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -72,7 +72,7 @@ intelGetString(struct gl_context * ctx, GLenum name) switch (name) { case GL_VENDOR: - return (GLubyte *) Tungsten Graphics, Inc; + return (GLubyte *) Intel® Open Source Technology Center; break; Uhm... isn't ® a character outside the ASCII range ? Some compiles might choke on this, i.e. the Sun Workshop/Forte/Studio compilers require -xcsi (... This option allows the C compiler to accept source code written in locales that do not conform to the ISO C source character code requirements. These locales include ja_JP.PCK ...) to avoid occasional hiccups. I'm happy to change it if it's an issue, but I believe that the ® character already appears in the source code: case PCI_CHIP_GM45_GM: chipset = Mobile Intel® GM45 Express Chipset; break; and it definitely appears in comments. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 20/26] mesa/tests: Add tests for the generated dispatch table
On 05/30/2012 03:19 PM, Eric Anholt wrote: On Tue, 29 May 2012 15:51:47 -0700, Ian Romanicki...@freedesktop.org wrote: +TEST(GetProcAddress, ABINameByOffset) +{ + /* 408 functions have had their locations in the dispatch table set since +* the danw of time. Verify that all of these functions are at the correct ^dawn D'oh! (also copy and pasted) I don't like the as big as at some git sha1 test given that you immediately go on to show that the test is invalid and just hack around it. That sounds to me like this test should be removed. Maybe just check that it's bigger than the fixed ABI? The intention is for the test to catch changes that accidentally cause the dispatch table to shrink. The dispatch table pretty much only ever grows. The most recent change to gl_API.xml that caused the dispatch table to shrink was a5f220607 in 2006. I'd be surprised if there were more changes after this series that shrink the dispatch table before another 6 years. :) Anything else that causes a shrink is a bug. I want to have some kind of test for that, but it doesn't necessarily have to be this test. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev