Arthur HUILLET [Tue, 30 Jun 2009 10:46:27 +0000 (12:46 +0200)]
mesa: fix transform_points_3d_no_rot using undefined values in %xmm0
Signed-off-by: Arthur HUILLET <arthur.huillet@free.fr>
Kristof Ralovich [Tue, 30 Jun 2009 14:31:18 +0000 (08:31 -0600)]
glx: plug a leak
Swrast was missing a free for the culmination of driConcatConfigs.
Use free(), not _mesa_free() since we shouldn't be calling any Mesa
functions from the GLX code. driConcatConfigs() should probably use
regular malloc/free to be consistant but the Mesa functions just wrap
the libc functions anyway.
Brian Paul [Tue, 30 Jun 2009 14:27:28 +0000 (08:27 -0600)]
glx: fix null pointer dereference segfault (bug 22546)
Keith Whitwell [Mon, 29 Jun 2009 15:07:14 +0000 (16:07 +0100)]
progs/util: make sure function pointers are initialized
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
José Fonseca [Tue, 30 Jun 2009 14:09:34 +0000 (15:09 +0100)]
mesa: Set FLUSH_EXPLICIT_BIT flags when calling FlushMappedBufferRange.
As prescribed by ARB_map_buffer_range.
José Fonseca [Tue, 30 Jun 2009 14:07:54 +0000 (15:07 +0100)]
util: Set PIPE_BUFFER_USAGE_FLUSH_EXPLICIT when calling buffer_flush_mapped_range.
José Fonseca [Tue, 30 Jun 2009 14:07:10 +0000 (15:07 +0100)]
gallium: New PIPE_BUFFER_USAGE_FLUSH_EXPLICIT flag for buffer_flush_mapped_range.
When a buffer was mapped for write and no explicit flush range was provided
the existing semantics were that the whole buffer would be flushed, mostly
for backwards compatability with non map-buffer-range aware code.
However if the buffer was mapped/unmapped with nothing really written --
something that often happens with the vbo -- we were unnecessarily assuming
that the whole buffer was written.
The new PIPE_BUFFER_USAGE_FLUSH_EXPLICIT flag (based from ARB_map_buffer_range
's GL_MAP_FLUSH_EXPLICIT_BIT flag) allows to clearly distinguish the
legacy usage from the nothing written usage.
Brian Paul [Mon, 29 Jun 2009 21:26:26 +0000 (15:26 -0600)]
intel: added null ptr check
This fixes a segfault seen with piglit's fdo20701 test.
Brian Paul [Mon, 29 Jun 2009 16:32:04 +0000 (10:32 -0600)]
progs/glsl: link with GLEW library
Keith Whitwell [Mon, 29 Jun 2009 13:13:58 +0000 (14:13 +0100)]
progs/glsl: compile with scons and glew
Get most of these working with scons.
José Fonseca [Mon, 29 Jun 2009 11:56:47 +0000 (12:56 +0100)]
scons: Don't raise an exception when DXSDK is not found.
Unfortunately scons does not check if a tool exists before it invokes
its generate function.
José Fonseca [Sun, 28 Jun 2009 10:12:22 +0000 (11:12 +0100)]
scons: Disable optimizations only for gcc-4.2
gcc-4.2's optimizer has a strange bug where it looses code from inner
loops in certain situations. For example, if the appearently innocent
looking code below is compiled with gcc-4.2 -S -O1, the inner loop's
code is missing from the outputed assembly.
struct Size {
unsigned width;
};
struct Command {
unsigned length;
struct Size sizes[32];
};
extern void emit_command(void *command, unsigned length);
void
create_surface( struct Size size, unsigned faces, unsigned levels)
{
struct Command cmd;
unsigned face;
unsigned level;
cmd.length = faces*levels*sizeof(cmd.sizes[0]);
for(face = 0; face < faces; ++face) {
for(level = 0; level < levels; ++level) {
cmd.sizes[face*levels + level] = size;
// This should generate a shrl statement, but the whole for body
// disappears in gcc-4.2 -O1/-O2/-O3!
size.width >>= 1;
}
}
emit(&cmd, sizeof cmd.length + cmd.length);
}
Note that this is not specific to MinGW's gcc-4.2 crosscompiler (the
version typically found in debian/ubuntu's mingw32 packages). gcc-4.2 on
Linux also displays the same error. gcc-4.3 and above gets this
correctly though.
Updated MinGW debian packages with gcc-4.3 are available from
http://people.freedesktop.org/~jrfonseca/debian/pool/main/m/
José Fonseca [Sun, 28 Jun 2009 09:54:23 +0000 (10:54 +0100)]
scons: Use -Bsymbolic linker option.
This prevents the error
relocation R_X86_64_PC32 against symbol `_gl_DispatchTSD' can not be used when making a shared object; recompile with -fPIC
when building on x86_64 architecture.
Brian Paul [Fri, 26 Jun 2009 22:54:44 +0000 (16:54 -0600)]
docs: detect when too many varying vars are used
Brian Paul [Fri, 26 Jun 2009 22:53:46 +0000 (16:53 -0600)]
glsl: check number of varying variables against the limit
Link fails if too many varying vars.
(cherry picked from master, commit
cc58fbcf2c5c88f406818db60910f537e03610d6)
Brian Paul [Fri, 26 Jun 2009 22:47:57 +0000 (16:47 -0600)]
docs: fix typos, remove old text from relnotes file
Brian Paul [Fri, 26 Jun 2009 22:46:21 +0000 (16:46 -0600)]
docs: bring over news updates from 7.4 branch
Brian Paul [Fri, 26 Jun 2009 22:45:54 +0000 (16:45 -0600)]
docs: bring in 7.4.3 and 7.4.4 release notes, news
Brian Paul [Fri, 26 Jun 2009 22:41:54 +0000 (16:41 -0600)]
docs: increase max varying vars to 16
Brian Paul [Fri, 26 Jun 2009 22:33:46 +0000 (16:33 -0600)]
mesa: raise MAX_VARYING (number of shader varying vars) to 16
16 is the limit for now because of various 32-bit bitfields.
(cherry picked from master, commit
4e762395ef7e8c332c16fd0c11025cfa52763a45)
Ian Romanick [Fri, 26 Jun 2009 20:30:16 +0000 (13:30 -0700)]
intel / DRI2: Additional flush of fake front-buffer to real front-buffer
To maintain correctness, the server will copy the real front-buffer to
a newly allocated fake front-buffer in DRI2GetBuffersWithFormat.
However, if the DRI2GetBuffersWithFormat is triggered by glViewport,
this will copy stale data into the new buffer. Fix this by flushing
the current fake front-buffer to the real front-buffer in
intel_viewport.
Fixes bug #22288.
Brian Paul [Fri, 26 Jun 2009 19:16:08 +0000 (13:16 -0600)]
mesa: bump version to 7.5-rc4
Brian Paul [Fri, 26 Jun 2009 19:15:17 +0000 (13:15 -0600)]
docs: document for/continue bug fix
Brian Paul [Fri, 26 Jun 2009 18:51:05 +0000 (12:51 -0600)]
cell: PIPE_CAP_TGSI_CONT_SUPPORTED query
Brian Paul [Fri, 26 Jun 2009 18:50:58 +0000 (12:50 -0600)]
softpipe: PIPE_CAP_TGSI_CONT_SUPPORTED query
Brian Paul [Fri, 26 Jun 2009 18:50:45 +0000 (12:50 -0600)]
gallium: added PIPE_CAP_TGSI_CONT_SUPPORTED
Brian Paul [Fri, 26 Jun 2009 18:34:03 +0000 (12:34 -0600)]
glsl: move/simplify error checking for 'return' statements
Brian Paul [Fri, 26 Jun 2009 17:33:05 +0000 (11:33 -0600)]
glsl: overhaul 'return' statement handling
A new node type (SLANG_OPER_RETURN_INLINED) is used to denote 'return'
statements inside inlined functions which need special handling.
All glean glsl1 tests pass for EmitContReturn=FALSE and TRUE.
Brian Paul [Thu, 25 Jun 2009 20:01:43 +0000 (14:01 -0600)]
glsl: predicate assignments according to __returnFlag
Fixes glean "function with early return (3)" case (when EmitContReturn=FALSE).
Brian Paul [Thu, 25 Jun 2009 20:02:41 +0000 (14:02 -0600)]
glsl: added slang_variable::is_global field
Brian Paul [Thu, 25 Jun 2009 17:52:37 +0000 (11:52 -0600)]
glsl: silence a problem warning
Brian Paul [Thu, 25 Jun 2009 17:32:37 +0000 (11:32 -0600)]
glsl: code refactoring for return statements
Brian Paul [Thu, 25 Jun 2009 17:12:26 +0000 (11:12 -0600)]
glsl: fix assorted regressions related to early-return-removal
Brian Paul [Thu, 25 Jun 2009 16:20:21 +0000 (10:20 -0600)]
glsl: comments, field reordering
Brian Paul [Thu, 25 Jun 2009 15:50:37 +0000 (09:50 -0600)]
glsl: rework loop nesting code
Brian Paul [Thu, 25 Jun 2009 15:30:53 +0000 (09:30 -0600)]
glsl: remove test for loop unrolling when we hit conditional cont/break
This is no longer needed since we added the new
_slang_loop_contains_continue_or_break() function/test.
Brian Paul [Wed, 24 Jun 2009 23:02:34 +0000 (17:02 -0600)]
glsl: checkpoint: predicate __retVal = expr with __returnFlag
The glean "function with early return (1)" test passes now.
Brian Paul [Wed, 24 Jun 2009 22:37:01 +0000 (16:37 -0600)]
glsl: use new helper functions in _slang_gen_logical_and/or()
Brian Paul [Wed, 24 Jun 2009 22:36:24 +0000 (16:36 -0600)]
glsl: add comments
Brian Paul [Wed, 24 Jun 2009 22:28:32 +0000 (16:28 -0600)]
glsl: checkpoint: replace 'return' with __returnFlag=true;
Needed for "remove early returns" transformation.
Brian Paul [Wed, 24 Jun 2009 22:25:00 +0000 (16:25 -0600)]
glsl: fix up scoping for parent/children in slang_operation_copy()
This will need more testing, but no regressions seen so far.
Brian Paul [Wed, 24 Jun 2009 22:12:20 +0000 (16:12 -0600)]
glsl: fix uninitialized var in _slang_gen_for_without_continue()
Brian Paul [Wed, 24 Jun 2009 22:04:33 +0000 (16:04 -0600)]
glsl: added slang_operation_free_children()
Brian Paul [Wed, 24 Jun 2009 19:16:49 +0000 (13:16 -0600)]
glsl: added slang_oper_num_children() helper
Brian Paul [Wed, 24 Jun 2009 14:40:56 +0000 (08:40 -0600)]
glsl: check-point: declare _returnFlag
Brian Paul [Tue, 23 Jun 2009 23:07:12 +0000 (17:07 -0600)]
glsl: added slang_operation_insert_child()
Brian Paul [Tue, 23 Jun 2009 22:55:10 +0000 (16:55 -0600)]
glsl: use slang_generate_declaration() to consolidate some code
Brian Paul [Tue, 23 Jun 2009 22:17:06 +0000 (16:17 -0600)]
glsl: remove obsolete comment
Brian Paul [Tue, 23 Jun 2009 20:28:43 +0000 (14:28 -0600)]
st/mesa: query PIPE_CAP_TGSI_CONT_SUPPORTED
Brian Paul [Tue, 23 Jun 2009 20:05:11 +0000 (14:05 -0600)]
glsl: implement _slang_gen_while_without_continue()
Brian Paul [Tue, 23 Jun 2009 19:33:28 +0000 (13:33 -0600)]
glsl: fix a bug involving 'continue' in 'for' loops
Need to execute the for loop's increment code before we continue.
Add a slang_assemble_ctx::CurLoopOper field to keep track of the containing
loop and avoid the "cont if true" path in this situation.
Plus, assorted clean-ups.
Brian Paul [Tue, 23 Jun 2009 18:46:11 +0000 (12:46 -0600)]
glsl: added slang_oper_child_const()
Brian Paul [Tue, 23 Jun 2009 16:57:59 +0000 (10:57 -0600)]
glsl: use _slang_loop_contains_continue_or_break() to check for unrolling
The previous test failed for nested loops.
Brian Paul [Thu, 18 Jun 2009 23:25:47 +0000 (17:25 -0600)]
glsl: use new _slang_loop_contains_continue() helper function
Brian Paul [Thu, 18 Jun 2009 23:08:10 +0000 (17:08 -0600)]
glsl: implement continue->break translation for do-while loops
Brian Paul [Thu, 18 Jun 2009 22:57:53 +0000 (16:57 -0600)]
glsl: added slang_operation_literal_int/bool() helper functions
Brian Paul [Thu, 18 Jun 2009 22:57:23 +0000 (16:57 -0600)]
glsl: don't allocate 0-length children array in slang_operation_copy()
Brian Paul [Thu, 18 Jun 2009 20:24:30 +0000 (14:24 -0600)]
glsl: remove debug code, misc clean-up
Brian Paul [Thu, 18 Jun 2009 20:14:53 +0000 (14:14 -0600)]
glsl: implement continue->break transformation for for-loops
Brian Paul [Thu, 18 Jun 2009 20:11:59 +0000 (14:11 -0600)]
glsl: added slang_operation_add_children() and slang_oper_child() helpers
Brian Paul [Thu, 18 Jun 2009 20:11:38 +0000 (14:11 -0600)]
glsl: added slang_assemble_ctx::EmitContReturn field, init
Brian Paul [Thu, 18 Jun 2009 18:43:43 +0000 (12:43 -0600)]
demos: improve argv parsing in fslight.c
Brian Paul [Wed, 17 Jun 2009 19:51:35 +0000 (13:51 -0600)]
glsl: don't unroll loops containing continue/break
Just search the AST in _slang_can_unroll_for_loop().
Brian Paul [Wed, 17 Jun 2009 19:48:52 +0000 (13:48 -0600)]
Revert "slang: if/else/break & if/else/continue work for unrolled loops"
We should just check if the loop contains a continue/break in the
_slang_can_unroll_for_loop() test function...
This reverts commit
989856bde47d699d7e18798df4013fbf962e1d4b.
Conflicts:
src/mesa/shader/slang/slang_codegen.h
Brian Paul [Wed, 17 Jun 2009 17:57:39 +0000 (11:57 -0600)]
glsl: Added gl_shader_state::EmitContReturn field
This is the start of a glsl-continue-return feature branch to support
a GLSL code generator option for 'continue' and 'return' statements.
Some targets don't support CONT or RET statements so we'll need to
try to generate code that does not use them...
Brian Paul [Wed, 24 Jun 2009 01:21:04 +0000 (19:21 -0600)]
docs: updated Mesa release instructions
José Fonseca [Fri, 26 Jun 2009 18:51:57 +0000 (19:51 +0100)]
scons: Tool to build with DirectX SDK.
Also works with MinGW, as long as the path to the DirectX SDK top
directory is set in the DXSDK_DIR environment variable.
José Fonseca [Fri, 26 Jun 2009 18:50:12 +0000 (19:50 +0100)]
scons: Don't use C specific options with g++
Keith Whitwell [Fri, 26 Jun 2009 12:43:10 +0000 (13:43 +0100)]
tgsi: correct handling of return value from util_vsnprintf
We were failing to deal with:
- vsnprintf returns negative value on error.
- vsnprintf returns the number of chars that *would* have been
written on truncation.
Keith Whitwell [Fri, 26 Jun 2009 12:44:20 +0000 (13:44 +0100)]
aux/indices: don't use 'prim' value once it is known to be bad
Theoretical bugfix only - no known case where this might happen.
José Fonseca [Wed, 24 Jun 2009 13:46:07 +0000 (14:46 +0100)]
wgl: Handle flush after a window is destroyed.
Fixes assertion failure with conform.
Brian Paul [Tue, 23 Jun 2009 15:31:27 +0000 (09:31 -0600)]
demos: fix issues in glxcontexts.c
The reshape() function was called when there was no GLX context so
the viewport/modelview/projection setup wasn't doing anything. Move
the call to reshape() into draw().
Also, remove -stereo, -fullscreen options and do some general clean-up.
Roland Scheidegger [Tue, 16 Jun 2009 19:38:58 +0000 (21:38 +0200)]
i965: handle OPCODE_SWZ in the glsl path
glsl compiler will not generate OPCODE_SWZ, and as a first step it would
be translated away to a MOV anyway (why?), but later internally this opcode is
generated (for EXT_texture_swizzling).
(cherry picked from commit
4ef1f8e3b52a06fcf58f78c9c36738531b91dbac)
Owen W. Taylor [Sat, 6 Jun 2009 18:46:22 +0000 (14:46 -0400)]
Disable SGI_swap_control extension for DRI2
We currently don't have support for SGI_swap_control for direct
contexts with DRI2, so disable reporting the extension. Reporting
the extension, and then having glXSwapIntervalSGI() "succeed"
but do nothing can confuse applications.
https://bugs.freedesktop.org/show_bug.cgi?id=22123
(cherry picked from commit
279143c6e808b37c333321b696d80df77f709a04)
Michel Dänzer [Thu, 11 Jun 2009 10:09:10 +0000 (12:09 +0200)]
intel: intel_texture_drawpixels() can't handle GL_DEPTH_STENCIL.
Fixes glean depthStencil test.
(cherry picked from commit
3885b708fdbb7bbd5dd3a247c41fb9a75ee7c057)
Brian Paul [Tue, 9 Jun 2009 21:07:39 +0000 (15:07 -0600)]
i965: added intelFlush() call in intel_get_tex_image()
Fixes the render-to-texture test in progs/tests/getteximage.c
(cherry picked from commit
a03b349153660e449daf4f56d750f1caef23b1a5)
Brian Paul [Fri, 22 May 2009 13:19:27 +0000 (07:19 -0600)]
mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in NV funcs
(cherry picked from commit
4dc426c01627a240bd5b148c1804c45b0d5ecd6c)
Brian Paul [Fri, 22 May 2009 13:26:08 +0000 (07:26 -0600)]
mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBS
Be clearer that this is the number of generic vertex program/shader
attributes, not counting the legacy attributes (pos, normal, color, etc).
(cherry picked from commit
4a95185c9f30c2de7a03bb1a0653f51b53b1111d)
Brian Paul [Thu, 21 May 2009 23:03:21 +0000 (17:03 -0600)]
mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS
(cherry picked from commit
d2a74d76c96957cf0294dcf40d29526621ada95e)
Brian Paul [Thu, 21 May 2009 16:05:04 +0000 (10:05 -0600)]
mesa: fix some potential state-restore issues in pop_texture_group()
Call the _mesa_set_enable() functions instead of driver functions, etc.
Also, add missing code for 1D/2D texture arrays.
(cherry picked from commit
aac19609bfd7c950b2577489b06886c8a8097bb2)
Brian Paul [Thu, 21 May 2009 15:52:33 +0000 (09:52 -0600)]
vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program
If we're running a vertex program to emulated fixed-function, we still need
to treat vertex arrays/attributes as if we're in fixed-function mode.
This should probably be back-ported to Mesa 7.5 after a bit more testing.
(cherry picked from commit
dda82137d28aba846dda73da230871c115e30aaf)
Brian Paul [Fri, 1 May 2009 15:30:32 +0000 (09:30 -0600)]
mesa: create/use a fallback texture when bound texture is incomplete
When a GLSL sampler reads from an incomplete texture it should
return (0,0,0,1). Instead of jumping through hoops in all the drivers
to make this happen, just create/install a fallback texture with those
texel values.
Fixes piglit/fp-incomplete-tex on i965 and more importantly, fixes some
GPU lockups when trying to sample from missing surfaces. If a binding
table entry is NULL, it seems that sampling sometimes works, but not
always (lockup).
Todo: create a fallback texture for each type of texture target?
(cherry picked from commit
3f25219c7bf0f090502489928f0f018e62c4f6cf)
Eric Anholt [Fri, 19 Jun 2009 22:57:03 +0000 (15:57 -0700)]
intel: Fix other metaops versus GL_COMPILE_AND_EXECUTE dlists.
Fixes oglconform zbfunc.c and pxtrans-cidraw.c, at least.
(cherry picked from commit
405300bb190f516e16b704050abe3389b366ed27)
Eric Anholt [Fri, 19 Jun 2009 22:49:24 +0000 (15:49 -0700)]
intel: Fix glClear behavior versus display lists.
The CALL_DrawArrays was leaking the clear's primitives into the display
list with GL_COMPILE_AND_EXECUTE. Use _mesa_DrawArrays instead, which
doesn't appear to leak. Fixes piglit dlist-clear test.
(cherry picked from commit
64edde1004f7a69e77877bba24d315a92bcd47c8)
Roland Scheidegger [Fri, 19 Jun 2009 18:00:55 +0000 (20:00 +0200)]
radeons: use dp4 for position invariant vertex programs
Fixes #22181. R200 requires this since DP4 is used in hw tnl mode.
R300 prefers it (should be faster due to no instruction dependencies), but
both methods should be correct (when sw tcl is used though, MUL/MAD might
be faster). Probably doesn't make much difference for R100 since vertex progs
are executed in software anyway, but let's just keep it the same there too.
Michel Dänzer [Fri, 19 Jun 2009 09:19:07 +0000 (11:19 +0200)]
Also release direct rendering resources in glXDestroyGLXPixmap.
Fixes leak running compiz with direct rendering.
Michel Dänzer [Fri, 19 Jun 2009 09:19:08 +0000 (11:19 +0200)]
Always free image offsets memory when re-initializing texture image fields.
Fixes leak running compiz with direct rendering.
José Fonseca [Fri, 19 Jun 2009 14:39:59 +0000 (15:39 +0100)]
scons: Output the friendly "Linking ..." message when creating DLLs with MinGW.
Brian Paul [Fri, 19 Jun 2009 14:40:43 +0000 (08:40 -0600)]
softpipe: return alpha=1 in shadow_compare() function
The alpha value wasn't set at all before so we got unpredictable results.
Note that we don't currently obey GL_DEPTH_TEXTURE_MODE in the state
tracker. For now, we return the result in the default mode (r,r,r,1).
José Fonseca [Thu, 18 Jun 2009 13:47:30 +0000 (14:47 +0100)]
util: Add cast.
It is expected to loose precision here.
José Fonseca [Thu, 18 Jun 2009 13:46:45 +0000 (14:46 +0100)]
draw: Replace pointer arithmetic with cast.
Using uintptr_t as intermediate type for pointer -> integer conversions is
easier to understand and does not cause any size mismatch warnings.
uintptr_t is part of C99, and we already provide a suitable replacement
definition for all platforms we care about.
José Fonseca [Thu, 18 Jun 2009 11:52:10 +0000 (12:52 +0100)]
trace: Use size_t consistently.
José Fonseca [Thu, 18 Jun 2009 11:51:00 +0000 (12:51 +0100)]
pipebuffer: Use a type consistently for sizes/offsets.
Avoids warnings on 64bit builds.
Use regular unsigned since that's what gallium expects, but use a
typedef to facilitate possible changes in the future.
José Fonseca [Wed, 17 Jun 2009 20:28:18 +0000 (21:28 +0100)]
wgl: Fix window resizing in multithread applications.
In multithreading stw_call_window_proc can be called by a thread other
than the thread where the context is bound.
José Fonseca [Wed, 17 Jun 2009 18:24:51 +0000 (19:24 +0100)]
wgl: Move all thread related code together.
Not only for cosmetic reasons, but also because we need to set the
SetWindowsHookEx hook for threads created before the DllMain is called
(threads for each we don't get the DLL_THREAD_ATTACH notification).
Keith Whitwell [Thu, 18 Jun 2009 09:13:55 +0000 (10:13 +0100)]
glew: correct misspelling of glFramebufferTextureLayer
This was misspelt as glFramebufferTexturLayer (missing e), causing
conflicts with the correctly spelt version in glext.h and extfuncs.h.
Keith Whitwell [Thu, 11 Jun 2009 09:52:37 +0000 (10:52 +0100)]
mesa: protect Elements against multiple definitions
Mesa and gallium both have a definition of this macro
Brian Paul [Mon, 8 Jun 2009 20:41:54 +0000 (14:41 -0600)]
intel: remove extra \n from warning string
(cherry picked from commit
42e9bde0fa2276b8f5bb434328eea7665794b127)
Robert Ellison [Thu, 14 May 2009 02:40:23 +0000 (20:40 -0600)]
i965: fix 1D texture borders with GL_CLAMP_TO_BORDER
With 1D textures, GL_TEXTURE_WRAP_T should be ignored (only
GL_TEXTURE_WRAP_S should be respected). But the i965 hardware
seems to follow the value of GL_TEXTURE_WRAP_T even when sampling
1D textures.
This fix forces GL_TEXTURE_WRAP_T to be GL_REPEAT whenever 1D
textures are used; this allows the texture to be sampled
correctly, avoiding "imaginary" border elements in the T direction.
This bug was demonstrated in the Piglit tex1d-2dborder test.
With this fix, that test passes.
(cherry picked from commit
ab6c4fa582972e25f8800c77b5dd5b3a83afc996)
Robert Ellison [Thu, 14 May 2009 02:38:33 +0000 (20:38 -0600)]
i965: send all warnings through _mesa_warning()
One warning message:
drm_i915_getparam: -22
was still being sent to fprintf(). This causes all Piglit tests to fail,
even with MESA_DEBUG=0.
Using _mesa_warning() to emit the message allows the general Mesa controls
for messages like this to be applied.
(cherry picked from commit
bc3270e99f5c39544aaf831742db14796ab83a6a)