From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5198 invoked by alias); 14 Dec 2007 01:06:34 -0000 Received: (qmail 5185 invoked by uid 22791); 14 Dec 2007 01:06:32 -0000 X-Spam-Check-By: sourceware.org Received: from hiauly1.hia.nrc.ca (HELO hiauly1.hia.nrc.ca) (132.246.100.193) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 14 Dec 2007 01:06:28 +0000 Received: from hiauly1.hia.nrc.ca (hiauly1.hia.nrc.ca [127.0.0.1] (may be forged)) by hiauly1.hia.nrc.ca (8.14.1/8.14.1) with ESMTP id lBE16IGu027766; Thu, 13 Dec 2007 20:06:24 -0500 (EST) Received: (from dave@localhost) by hiauly1.hia.nrc.ca (8.14.1/8.14.1/Submit) id lBE16Ip1027764; Thu, 13 Dec 2007 20:06:18 -0500 (EST) Message-Id: <200712140106.lBE16Ip1027764@hiauly1.hia.nrc.ca> Subject: Re: [committed] [PR target/34091] Secondary reloads for floating-point register classes To: dave@hiauly1.hia.nrc.ca (John David Anglin) Date: Fri, 14 Dec 2007 01:57:00 -0000 From: "John David Anglin" Cc: gcc-patches@gcc.gnu.org In-Reply-To: from "John David Anglin" at Dec 9, 2007 03:19:35 pm X-Mailer: ELM [version 2.4 PL25] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2007-12/txt/msg00640.txt.bz2 I added the following test from PR target/34091. Tested on hppa2.0w-hp-hpux11.11 and hppa64-hp-hpux11.11. Dave -- J. David Anglin dave.anglin@nrc-cnrc.gc.ca National Research Council of Canada (613) 990-0752 (FAX: 952-6602) 2007-12-13 John David Anglin PR target/34091 * gcc.c-torture/compile/pr34091.c: New test. --- /dev/null Sun Dec 9 15:49:09 2007 +++ gcc.c-torture/compile/pr34091.c Sun Dec 9 15:46:56 2007 @@ -0,0 +1,175 @@ +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef int GLint; +typedef unsigned short GLushort; +typedef unsigned int GLuint; +typedef float GLfloat; +typedef GLushort GLchan; +struct gl_texture_image; +typedef struct __GLcontextRec GLcontext; +typedef void (*FetchTexelFuncC) (const struct gl_texture_image * texImage, + GLint col, GLint row, GLint img, + GLchan * texelOut); +struct gl_texture_format +{ +}; +struct gl_texture_image +{ + GLenum _BaseFormat; + GLboolean _IsPowerOfTwo; + FetchTexelFuncC FetchTexelc; +}; +struct gl_texture_object +{ + GLenum Target; + GLenum WrapS; + GLenum MinFilter; + GLenum MagFilter; + GLint BaseLevel; + GLint _MaxLevel; + struct gl_texture_image *Image[6][12]; +}; +enum _format +{ + MESA_FORMAT_RGBA_DXT3, MESA_FORMAT_RGBA_DXT5, MESA_FORMAT_RGBA, + MESA_FORMAT_RGB, MESA_FORMAT_ALPHA, MESA_FORMAT_LUMINANCE, +}; +typedef void (*texture_sample_func) (GLcontext * ctx, + const struct gl_texture_object * tObj, + GLuint n, const GLfloat texcoords[][4], + const GLfloat lambda[], + GLchan rgba[][4]); +lerp_2d (GLfloat a, GLfloat b, GLfloat v00, GLfloat v10, GLfloat v01, + GLfloat v11) +{ + const GLfloat temp0 = ((v00) + (a) * ((v10) - (v00))); + const GLfloat temp1 = ((v01) + (a) * ((v11) - (v01))); + return ((temp0) + (b) * ((temp1) - (temp0))); +} +static __inline__ void +lerp_rgba (GLchan result[4], GLfloat t, const GLchan a[4], const GLchan b[4]) +{ + result[0] = (GLchan) (((a[0]) + (t) * ((b[0]) - (a[0]))) + 0.5); + result[1] = (GLchan) (((a[1]) + (t) * ((b[1]) - (a[1]))) + 0.5); + result[2] = (GLchan) (((a[2]) + (t) * ((b[2]) - (a[2]))) + 0.5); +} +static __inline__ void +lerp_rgba_2d (GLchan result[4], GLfloat a, GLfloat b, const GLchan t00[4], + const GLchan t10[4], const GLchan t01[4], const GLchan t11[4]) +{ + result[0] = (GLchan) (lerp_2d (a, b, t00[0], t10[0], t01[0], t11[0]) + 0.5); + result[1] = (GLchan) (lerp_2d (a, b, t00[1], t10[1], t01[1], t11[1]) + 0.5); + result[2] = (GLchan) (lerp_2d (a, b, t00[2], t10[2], t01[2], t11[2]) + 0.5); +} +static __inline__ void +sample_2d_linear_repeat (GLcontext * ctx, + const struct gl_texture_object *tObj, + const struct gl_texture_image *img, + const GLfloat texcoord[4], GLchan rgba[]) +{ + GLint i0, j0, i1, j1; + GLfloat a, b; + GLchan t00[4], t10[4], t01[4], t11[4]; + { + }; + img->FetchTexelc (img, i1, j1, 0, t11); + lerp_rgba_2d (rgba, a, b, t00, t10, t01, t11); +} +sample_2d_nearest_mipmap_linear (GLcontext * ctx, + const struct gl_texture_object *tObj, + GLuint n, const GLfloat texcoord[][4], + const GLfloat lambda[], GLchan rgba[][4]) +{ + GLuint i; + GLint level = linear_mipmap_level (tObj, lambda[i]); + sample_2d_nearest (ctx, tObj, tObj->Image[0][tObj->_MaxLevel], texcoord[i], rgba[i]); + GLchan t0[4], t1[4]; + sample_2d_nearest (ctx, tObj, tObj->Image[0][level], texcoord[i], t0); + sample_2d_nearest (ctx, tObj, tObj->Image[0][level + 1], texcoord[i], t1); +} +static void +sample_2d_linear_mipmap_linear_repeat (GLcontext * ctx, + const struct gl_texture_object *tObj, + GLuint n, const GLfloat texcoord[][4], + const GLfloat lambda[], + GLchan rgba[][4]) +{ + GLuint i; + for (i = 0; i < n; i++) + { + GLint level = linear_mipmap_level (tObj, lambda[i]); + if (level >= tObj->_MaxLevel) + { + GLchan t0[4], t1[4]; + const GLfloat f = ((lambda[i]) - ifloor (lambda[i])); + sample_2d_linear_repeat (ctx, tObj, tObj->Image[0][level], + texcoord[i], t0); + sample_2d_linear_repeat (ctx, tObj, tObj->Image[0][level + 1], + texcoord[i], t1); + lerp_rgba (rgba[i], f, t0, t1); + } + } +} +static void +sample_lambda_2d (GLcontext * ctx, const struct gl_texture_object *tObj, + GLuint n, const GLfloat texcoords[][4], + const GLfloat lambda[], GLchan rgba[][4]) +{ + const struct gl_texture_image *tImg = tObj->Image[0][tObj->BaseLevel]; + GLuint minStart, minEnd; + GLuint magStart, magEnd; + const GLboolean repeatNoBorderPOT = (tObj->WrapS == 0x2901) + && (tImg->_BaseFormat != 0x1900) && tImg->_IsPowerOfTwo; + compute_min_mag_ranges (tObj, n, lambda, &minStart, &minEnd, &magStart, + &magEnd); + if (minStart < minEnd) + { + const GLuint m = minEnd - minStart; + switch (tObj->MinFilter) + { + case 0x2600: + if (repeatNoBorderPOT) + { + case MESA_FORMAT_RGB: + opt_sample_rgb_2d (ctx, tObj, m, texcoords + minStart, + ((void *) 0), rgba + minStart); + case MESA_FORMAT_RGBA: + opt_sample_rgba_2d (ctx, tObj, m, texcoords + minStart, + ((void *) 0), rgba + minStart); + } + { + sample_nearest_2d (ctx, tObj, m, texcoords + minStart, + ((void *) 0), rgba + minStart); + } + break; + sample_2d_nearest_mipmap_linear (ctx, tObj, m, texcoords + minStart, + lambda + minStart, + rgba + minStart); + case 0x2703: + if (repeatNoBorderPOT) + sample_2d_linear_mipmap_linear_repeat (ctx, tObj, m, + texcoords + minStart, + lambda + minStart, + rgba + minStart); + } + switch (tObj->MagFilter) + { + case MESA_FORMAT_RGB: + opt_sample_rgb_2d (ctx, tObj, m, texcoords + magStart, + ((void *) 0), rgba + magStart); + opt_sample_rgba_2d (ctx, tObj, m, texcoords + magStart, + ((void *) 0), rgba + magStart); + sample_nearest_2d (ctx, tObj, m, texcoords + magStart, + ((void *) 0), rgba + magStart); + } + } +} +texture_sample_func +_swrast_choose_texture_sample_func (const struct gl_texture_object *t) +{ + switch (t->Target) + { + case 0x0DE0: + return &sample_lambda_2d; + } +}