Julien Cristau
af3c568475
Prepare changelog for upload
2009-03-25 11:34:58 +01:00
Julien Cristau
7d01429512
Build-depend on linux-libc-dev >= 2.6.29 on linux archs.
...
The 2.6.28 kernel headers miss some compat defines.
2009-03-25 01:51:02 +01:00
Julien Cristau
8d088cd34f
update changelog
2009-03-23 17:25:04 +01:00
Julien Cristau
094d627885
Merge tag 'mesa_7_4_rc1' into debian-experimental
2009-03-23 17:21:26 +01:00
Brian Paul
17db2db9dc
docs: prep for 7.4 release
2009-03-20 17:34:54 -06:00
Brian Paul
dba79af9bc
mesa: prep for 7.4-rc1 release
2009-03-20 17:26:04 -06:00
Brian Paul
b009a32bf4
r300: don't crash on sw tcl hw if point size vertex attrib is sent
...
(cherry picked from master, commit 005ad1a71d
)
2009-03-20 08:49:39 -06:00
Brian Paul
7122490982
mesa: avoid setting texObj->_Complete = GL_FALSE when there's no state change
...
Avoid a little bit of unneeded state validation and fixes a bug where the
texture complete flags was set to false, but we didn't signal _NEW_TEXTURE.
Fixes piglit tex1d-2dborder failure.
(cherry picked from commit aad3f546a0
)
2009-03-18 14:47:47 -07:00
Brian Paul
6ada1d47d9
mesa: add no-change testing for a few more texture parameters
...
(cherry picked from commit 37c768b36a
)
2009-03-18 10:54:09 -07:00
Robert Ellison
55865335f4
i965: fix polygon stipple when rendering to FBO
...
The polygon stipple pattern, like the viewport and the
polygon face orientation, must be inverted on the i965
when rendering to a FBO (which itself has an inverted pixel
coordinate system compared to raw Mesa).
In addition, the polygon stipple offset, which orients
the stipple to the window system, disappears when rendering
to an FBO (because the window system offset doesn't apply,
and there's no associated FBO offset).
With these fixes, the conform triangle and polygon stipple
tests pass when rendering to texture.
(cherry picked from commit 29309b45b0
)
2009-03-18 10:47:24 -07:00
Robert Ellison
918e5221ef
i965: fix polygon face orientation when rendering to FBO
...
In the i965, the FBO coordinate system is inverted from the standard
OpenGL/Mesa coordinate system; that means that the viewport and the
polygon face orientation have to be inverted if rendering to a FBO.
The viewport was already being handled correctly; but polygon face
was not. This caused a conform failure when rendering to texture with
two-sided lighting enabled.
This fixes the problem in the i965 driver, and adds to the comment about
the gl_framebuffer "Name" field so that this isn't a surprise to other
driver writers.
(cherry picked from commit 6dceeb2eb8
)
2009-03-18 10:47:24 -07:00
Brian Paul
9feb26584a
swrast: use better _swrast_compute_lambda() function
...
The MAX-based function can produce values that are non-monotonic for a span
which causes glitches in texture filtering. The sqrt-based one avoids that.
This is perhaps slightly slower than before, but the difference
probably isn't noticable given we're doing software mipmap filtering.
Issue reported by Nir Radian <nirr@horizonsemi.com >
(cherry picked from master, commit c334ce273e
)
2009-03-17 10:34:45 -06:00
Ian Romanick
a8528a2e86
Mark current bits as 2009Q1-RC1 for Intel driver.
2009-03-16 13:39:32 -07:00
Brian Paul
119360cccd
i965: init dest reg CondMask = COND_TR (the proper default)
...
Plus fix up a debug printf.
(cherry picked from commit 20f49252e1
)
2009-03-13 17:38:40 -07:00
Brian Paul
ac2216542d
glsl: fix vec4_texp_rect IR code (need projective version) (cherry picked from commit ad2cfa4199
)
2009-03-13 17:38:40 -07:00
Brian Paul
37e5c057f1
i965: check if we run out of GRF/temp registers
...
Before this change we would up emitting instructions with invalid register
numbers. This typically (but not always) hung the GPU. For now, just
prevent emitting bad instructions to avoid hangs. Still need to do some
kind of proper error recovery.
(cherry picked from commit e60b3067d8
)
2009-03-13 17:38:40 -07:00
Brian Paul
4d9b8e0f93
mesa: added _mesa_fprintf() wrapper (cherry picked from commit 596b8fbbbf
)
2009-03-13 17:38:40 -07:00
Brian Paul
c1b71f46b5
i965: fix emit_math1() function used for scalar instructions
...
Instructions such as RCP, RSQ, LOG must smear the result of the function
across the dest register's X, Y, Z and W channels (subject to write masking).
Before this change, only the X component was getting written.
Among other things, this fixes cube map texture sampling in GLSL shaders
(since cube lookups involve normalizing the texcoord).
(cherry picked from commit 3485801978
)
2009-03-13 17:38:39 -07:00
Brian Paul
4a25ac9564
i965: rewrite the code for handling shader subroutine calls
...
Previously, the prog_instruction::Data field was used to map original Mesa
instructions to brw instructions in order to resolve subroutine calls. This
was a rather tangled mess. Plus it's an obstacle to implementing dynamic
allocation/growing of the instruction buffer (it's still a fixed size).
Mesa's GLSL compiler emits a label for each subroutine and CAL instruction.
Now we use those labels to patch the subroutine calls after code generation
has been done. We just keep a list of all CAL instructions that needs patching
and a list of all subroutine labels. It's a simple matter to resolve them.
This also consolidates some redundant post-emit code between brw_vs_emit.c and
brw_wm_glsl.c and removes some loops that cleared the prog_instruction::Data
fields at the end.
Plus, a bunch of new comments.
(cherry picked from commit c51c822ee0
)
2009-03-13 17:38:39 -07:00
Eric Anholt
35d965b39b
intel: Fix bpp setting of blits to 8bpp targets.
...
This was causing hangs in cairogears, as we would blit to the 8bpp target
(A8 texture) as 16bpp, and stomp over state objects.
(cherry picked from commit 19e134051c
)
2009-03-13 17:38:39 -07:00
Robert Ellison
d0aab00609
i965: add software fallback for conformant 3D textures and GL_CLAMP
...
The i965 hardware cannot do GL_CLAMP behavior on textures; an earlier
commit forced a software fallback if strict conformance was required
(i.e. the INTEL_STRICT_CONFORMANCE environment variable was set) and
2D textures were used, but it was somewhat flawed - it could trigger
the software fallback even if 2D textures weren't enabled, as long
as one texture unit was enabled.
This fixes that, and adds software fallback for GL_CLAMP behavior with
1D and 3D textures.
It also adds support for a particular setting of the INTEL_STRICT_CONFORMANCE
environment variable, which forces software fallbacks to be taken *all*
the time. This is helpful with debugging. The value is:
export INTEL_STRICT_CONFORMANCE=2
(cherry picked from commit 3468315087
)
2009-03-13 17:38:39 -07:00
Brian Paul
ef33d0f103
mesa: don't draw arrays if vertex position array is not enabled
...
For regular GL, we must have vertex positions in order to draw. But ES2
doesn't have that requirement (positions can be computed from any array
of data).
See bug 19911.
(cherry picked from commit 97dd2ddbd9
)
2009-03-13 17:38:39 -07:00
Robert Ellison
349b819768
i965: texture fixes: bordered textures, fallback rendering
...
i965 doesn't natively support GL_CLAMP; it treats it like
GL_CLAMP_TO_EDGE, which fails conformance tests.
This fix adds a clause to the check_fallbacks() test to check
whether GL_CLAMP is in use on any enabled 2D texture. If so,
and if strict conformance is required (via INTEL_STRICT_CONFORMANCE),
a software fallback is mandated.
In addition, validate textures *before* checking for fallbacks,
rather than after; otherwise, the texture state is never validated
and can't be trusted. (In particular, if texturing is enabled and
the sampler would access any level beyond level 0 of a texture, the
sampler will segfault, because texture validation sets the firstLevel
and lastLevel fields of a texture object so that the valid levels
will be mapped and accessed correctly. If texture validation doesn't
occur, only level 0 is accessed correctly, and that only because
firstLevel and lastLevel happen to be set to 0.)
(cherry picked from commit 17c7852bf9
)
2009-03-13 17:38:39 -07:00
Dave Airlie
50443db882
texmem: fix typo from brianp's changes.
...
Reported by cjb via tinderbox on irc
(cherry picked from commit 487a55af78
)
2009-03-13 17:38:39 -07:00
Brian Paul
c503cacb53
mesa: use an array for current texture objects
...
Use loops to consolidate lots of texture object code.
(cherry picked from commit 9818734e01
)
2009-03-13 17:38:39 -07:00
Brian Paul
e862b4e38f
mesa: use an array for default texture objects
...
Replace Default1D/2D/3D/Cube/etc with DefaultTex[TEXTURE_x_INDEX].
The same should be done with the Current1D/2D/3D/etc pointers...
(cherry picked from commit 4d24b639d1
)
2009-03-13 17:38:39 -07:00
Robert Ellison
e9dfc858fb
Fix an i965 assertion failure on glClear()
...
While running conform with render-to-texture:
conform -d 33 -v 2 -t -direct
the i965 driver failed this assertion:
intel_clear.c:77: intel_clear_tris: Assertion `(mask & ~((1 << BUFFER_BACK_LEFT) | (1 << BUFFER_FRONT_LEFT) | (1 << BUFFER_DEPTH) | (1 << BUFFER_STENCIL))) == 0' failed.
The problem is that intel_clear_tris() is called by intelClear() to
clear any and all of the available color buffers, but intel_clear_tris()
actually only handles the back left and front left color buffers; so
the assertion fails as soon as you try to clear a non-standard color
buffer.
The fix is to have intelClear() only call intel_clear_tris() with
buffers that intel_clear_tris() can support. intelClear() already backs
down to _swrast_Clear() for all buffers that aren't handled explicitly.
(cherry picked from commit 0ccbc3c905
)
2009-03-13 17:38:39 -07:00
Brian Paul
5efbca1e21
intel: fix datatype typo, s/GLboolean/GLuint/
...
Fixes mysterious failures in glean glsl1 test.
(cherry picked from commit da2b661ee4
)
2009-03-13 17:38:39 -07:00
Kristian Høgsberg
d6d8663a88
intel: Fix intelSetTexBuffer miptree leak.
...
The intelImage also holds a reference to the miptree, so unref that as well.
(cherry picked from commit 5b354d39d4
)
2009-03-13 17:38:39 -07:00
Eric Anholt
13990bd98a
intel: tell libdrm whether we want a cpu-ready or gpu-ready BO for regions.
...
This lets us avoid allocing new buffers for renderbuffers, finalized miptrees,
and PBO-uploaded textures when there's an unreferenced but still active one
cached, while also avoiding CPU waits for batchbuffers and CPU-uploaded
textures. The size of BOs allocated for a desktop running current GL
cairogears on i915 is cut in half with this.
Note that this means we require libdrm 2.4.5.
(cherry picked from commit 40dd024be6
)
2009-03-13 17:38:39 -07:00
Eric Anholt
def630d0a2
i965: Fix render target read domains.
...
We were asking for something illegal (write_domain != 0 && read_domains !=
write_domain) because at the time of writing the region surfaces were used
for texturing occasionally as well, and we weren't really clear on the model
GEM was going to use.
This reliably triggered a kernel bug with domain handling, resulting in
oglconform mustpass.c failure. Of course, it only became visible after
01bc4d441f
cleaned up some gratuitous flushing.
(cherry picked from commit 078e8a61b2
)
2009-03-13 17:38:39 -07:00
Eric Anholt
ca2564f1e6
intel: Don't do the extra MI_FLUSH in flushing except when doing glFlush().
...
Everything other than "make sure the last rendering ends up visible on the
screen" doesn't need that behavior.
(cherry picked from commit 01bc4d441f
)
2009-03-13 17:38:38 -07:00
Eric Anholt
711a57f7c7
intel: don't crash when dri2 tells us about buffers we don't care about. (cherry picked from commit f82f1ffba9
)
2009-03-13 17:38:38 -07:00
Eric Anholt
058cf2fff1
dri2: Initialize variables for the getbuffers round-trip reduction.
...
Missed setting the initial values which usually didn't hurt at runtime.
(cherry picked from commit 680c708dee
)
2009-03-13 17:38:38 -07:00
Eric Anholt
715f509c5d
intel: Fix tri clear to do FBO color attachments as well.
...
This is a 2% win in fbo_firecube, and would avoid a sw fallback for
masked clears.
(cherry picked from commit fd51cf1531
)
2009-03-13 17:38:38 -07:00
Eric Anholt
e704e6c6f3
i965: Fix fallback on stencil drawing to fbo when the visual lacks stencil.
...
Noticed this with the fbotexture demo.
(cherry picked from commit c06f4e2a37
)
2009-03-13 17:38:38 -07:00
Brian Paul
01f34e667a
i965: need to disable current shader, if any, in intel_clear_tris()
...
Fixes bad background in all the progs/glsl/ tests.
(cherry picked from commit 60b3fe6c19
)
2009-03-13 17:38:38 -07:00
Eric Anholt
4d0a7b33c5
intel: Speed up glDrawPixels(GL_ALPHA) by using an alpha texture format. (cherry picked from commit 0b63f6449e
)
2009-03-13 17:38:38 -07:00
Eric Anholt
fb1d2ed34c
intel: Fix some state leakage of {Client,}ActiveTexture in metaops.
...
Found while debugging cairo-gl.
(cherry picked from commit d11981e0d7
)
2009-03-13 17:38:38 -07:00
Eric Anholt
9395fedf98
i965: Remove brw->attribs now that we can just always look in the GLcontext. (cherry picked from commit 052c1d66a1
)
2009-03-13 17:38:38 -07:00
Eric Anholt
9abc0d80af
i965: Delete old metaops code now that there are no remaining consumers. (cherry picked from commit 14321fcfde
)
2009-03-13 17:38:38 -07:00
Brian Paul
90e89c01df
i965: init array->Format fields (see bug 19708) (cherry picked from commit 628b52241b
)
2009-03-13 17:38:38 -07:00
Eric Anholt
790d93e362
intel: If we're doing a depth clear with tris, do color with it.
...
This is a 10% win on the ever-important glxgears not-a-benchmark.
(cherry picked from commit 67ee22c89f
)
2009-03-13 17:38:38 -07:00
Eric Anholt
e9f3783169
i915: Only call CalcViewport from DrawBuffers instead of Viewport.
...
This saves an inadvertent round-trip to the X Server on DrawBuffers, which was
hurting some metaops.
(cherry picked from commit ac0dfbdf0f
)
2009-03-13 17:38:38 -07:00
Brian Paul
e41780fedc
intel: move some driver functions around
...
A step toward consolidating i915/intel_state.c and i965/intel_state.c
(cherry picked from commit 84c8b5bbf9
)
2009-03-13 17:38:38 -07:00
Eric Anholt
d0edbbb3f3
intel: replace custom metaops clear with generic.
...
No real-world impact on performance seen. Even glxgears seems to be, if
anything, happier.
(cherry picked from commit c96bac0950
)
2009-03-13 17:38:38 -07:00
Brian Paul
e10119c23e
intel: make intelUpdateScreenFromSAREA() static (cherry picked from commit aae2729aeb
)
2009-03-13 17:38:38 -07:00
Brian Paul
208c087f39
intel: remove unused var (cherry picked from commit 66c7f06413
)
2009-03-13 17:38:38 -07:00
Shaohua Li
0c8b40b42b
i915: Add support for a new G33-like chipset.
...
Signed-off-by: Shaohua Li <shaohua.li@intel.com >
Signed-off-by: Eric Anholt <eric@anholt.net >
(cherry picked from commit 40290745ea
)
2009-03-13 17:38:37 -07:00
Xiang, Haihao
5199f451bb
i965: fix for RHW workaround
...
It is possible that an object whose vertices all are outside of a
view plane is passed to clip thread due to the RHW workaround. This
object should be rejected by clip thread. Fix bug #19879
(cherry picked from commit 68915fd6fa
)
2009-03-13 17:38:37 -07:00
Brian Paul
dd7cde5230
i965: tell GLSL compiler to emit code using condition codes
...
The default for EmitCondCodes got flipped when gallium-0.2 was merged.
This fixes GLSL if/else/endif regressions.
Drivers that use GLSL should always explicitly set the flag to be safe.
(cherry picked from commit a9e753c84c
)
2009-03-13 17:38:37 -07:00
Eric Anholt
ab5746e5d8
tdfx: Fix begin/endquery for current API. (cherry picked from commit 0cb295584f
)
2009-03-13 17:38:37 -07:00
Brian Paul
3bd446c0ab
i965: add missing break for OPCODE_RET case
...
This doesn't effect correctness, but we were emitting an extraneous ADD.
(cherry picked from commit 74b6d55864
)
2009-03-13 17:38:37 -07:00
Brian Paul
9b78402ee4
mesa: more info in error messages (cherry picked from commit 1ca05a066b
)
2009-03-13 17:38:37 -07:00
Brian Paul
cf1ef0f308
mesa: minor error msg improvement (cherry picked from commit 803504e69f
)
2009-03-13 17:38:37 -07:00
Chris Wilson
fd1f65ba61
intel: Decode MI operands using specific length masks
...
The MI opcodes have different variable length masks, so use an operand
specific mask to decode the length.
(cherry picked from commit e92d97d75b
)
2009-03-13 17:38:37 -07:00
Chris Wilson
967345b497
intel: Correct decoding of 3DSTATE_PIXEL_SHADER_CONSTANTS
...
A couple of minor typos that proclaimed an error in the wrong command, and
failed to offset the mask.
(cherry picked from commit 05d130a35a
)
2009-03-13 17:38:37 -07:00
Ian Romanick
41ad853a6a
glxgears: No, really. Fix the dyslexia. (cherry picked from commit 5b5ddfb89c
)
2009-03-13 17:38:37 -07:00
Ian Romanick
842baa29cb
Fix dyslexia. (cherry picked from commit 9d6880ec8d
)
2009-03-13 17:38:37 -07:00
Ian Romanick
9556d870a1
glxgears: Log a message if synched to vblank
...
Tries to use either GLX_MESA_swap_control or GLX_SGI_video_sync to
detect whether the display is synchronized to the vertical blank. If
it detects this, a message will be printed. HOPEFULLY this will
prevent some of the bug reports such as "glxgears only gets 59.7fps.
What's wrong with my driver?"
(cherry picked from commit 58b9cd411f
)
2009-03-13 17:38:37 -07:00
Brian Paul
42ce790086
mesa: refactor glTexParameter code (cherry picked from commit 318e53a4bf
)
2009-03-13 17:38:37 -07:00
Robert Ellison
b17769af42
mesa: add missing texture_put_row_rgb() function in texrender.c
...
The wrap_texture() function doesn't set the renderbuffer PutRowRGB() method,
which is used to implement DrawPixels(). This fix adds an implementation
of this method.
(cherry picked from commit 523febe12e
)
2009-03-13 17:38:37 -07:00
Brian Paul
9030277b0d
intel: move glClear-related code into new intel_clear.c file (cherry picked from commit 4451eb2e75
)
2009-03-13 17:38:37 -07:00
Brian Paul
a37a9bf769
intel: Move swap-related functions from intel_buffers.c to new intel_swapbuffers.c (cherry picked from commit 6fcebbe719
)
2009-03-13 17:38:37 -07:00
Brian Paul
8afb8a8145
i965: scissor rect was inverted when rendering to texture (cherry picked from commit 3b23a8e07d
)
2009-03-13 17:38:37 -07:00
Brian Paul
801f933694
mesa: consolidate glGetTexEnvi/f() code with new get_texenvi() helper (cherry picked from commit ad338c14c2
)
2009-03-13 17:38:36 -07:00
Jesse Barnes
75ecd6ebbf
intel: fix the mismerge of the vblank pipe enable sanity check
...
Fix the last merge fix, had the blocks ordered incorrectly.
(cherry picked from commit e57e398960
)
2009-03-13 17:38:36 -07:00
Jesse Barnes
1cd7317fdb
intel: move pipe enable sanity check to where it belongs
...
Bah, applied the patches in the wrong order, not Owain's fault...
(cherry picked from commit 216bff5fd4
)
2009-03-13 17:38:36 -07:00
Owain Ainsworth
1865291701
intel: fix vblank crtc selection with DRI1 when only one pipe is enabled.
...
On Mobile chipsets, we often enable PipeB instead of PipeA, but the test
in here was insufficient, falling back to pipe A if the area
intersection returned zero. Therefore, in the case where a window went
off to the top of the left of the screen, it would freeze, waiting on
the wrong vblank.
Fix this mess by checking the sarea for a crtc being zero sized, and in
that case always default to the other one.
(cherry picked from commit 0b5266ff64
)
2009-03-13 17:38:36 -07:00
Owain G. Ainsworth
3edbcce7d5
intel: Prevent an "irq is not working" printf when only pipe B is enabled.
...
intelMakeCurrent is called before intelWindowMoved (in fact, it calls
it), so calculation of the correct vblank crtc has not happened yet.
Fix this by making a function that fixes up a set of vblank flags and
call if from both functions.
(cherry picked from commit 39b4061bb9
)
2009-03-13 17:38:36 -07:00
Robert Ellison
b1fb34d0ac
i965: fix line stipple fallback for GL_LINE_STRIP primitives
...
When doing line stipple, the stipple count resets on each line segment,
unless the primitive is a GL_LINE_LOOP or a GL_LINE_STRIP.
The existing code correctly identifies the need for a software fallback
to handle conformant line stipple on GL_LINE_LOOP primitives, but
neglects to make the same assessment on GL_LINE_STRIP primitives.
This fixes it so they match.
(cherry picked from commit 73658ff04f
)
2009-03-13 17:38:36 -07:00
Ian Romanick
606099f545
swrast: Enable GL_EXT_stencil_two_side (cherry picked from commit b5fbdef7ec
)
2009-03-13 17:38:36 -07:00
Brian Paul
32e3142071
i965: minor improvements in brw_wm_populate_key() (cherry picked from commit 89fddf978c
)
2009-03-13 17:38:36 -07:00
Brian Paul
66eea4e104
mesa: fix/update/restore comments related to two-sided stencil (cherry picked from commit a304cc6cca
)
2009-03-13 17:38:36 -07:00
Brian Paul
e428cf3afd
mesa: initialize ctx->Stencil._BackFace = 1
...
Back-face stencil operations didn't work correctly because this value was
zero. It needs to be 1 or 2. The only place it's set otherwise is in
glEnable/Disable(GL_STENCIL_TEST_TWO_SIDE_EXT).
(cherry picked from commit 2a968113a9
)
2009-03-13 17:38:36 -07:00
Ian Romanick
842b5164d2
Track two sets of back-face stencil state
...
Track separate back-face stencil state for OpenGL 2.0 /
GL_ATI_separate_stencil and GL_EXT_stencil_two_side. This allows all
three to be enabled in a driver. One set of state is set via the 2.0
or ATI functions and is used when STENCIL_TEST_TWO_SIDE_EXT is
disabled. The other is set by StencilFunc and StencilOp when the
active stencil face is set to BACK. The GL_EXT_stencil_two_side spec has
more details.
http://opengl.org/registry/specs/EXT/stencil_two_side.txt
(cherry picked from commit dde7cb9628
)
2009-03-13 17:38:36 -07:00
Brian Paul
a6f7e909a7
mesa: fix transposed red/blue in store_texel_rgb888/bgr888() functions
...
(cherry picked from master, commit 862dccd560
)
2009-03-12 09:32:55 -06:00
Brian Paul
ca87e5a7bd
mesa: add missing _glthread_INIT_MUTEX in _mesa_new_framebuffer()
...
(cherry picked from master, commit 81569c2f69
)
2009-03-12 08:12:54 -06:00
Alan Hourihane
45c4b4dfbd
xdemos: On termination with esc
close the contexts correctly.
2009-03-11 13:36:26 +00:00
Brian Paul
2adaec1226
xmesa: set back-buffer's drawable field
...
Fixes back-buffer rendering when MESA_BACK_BUFFER=pixmap
(cherry picked from master, commit 22bac2a1a0
)
2009-03-09 16:28:50 -06:00
Brian Paul
549586c319
i965: fix cube map lock-up / corruption
...
If we're using anything but GL_NEAREST sampling of a cube map, we need to
use the BRW_TEXCOORDMODE_CUBE texcoord wrap mode. Before this, the GPU
would either lock up or subsequent texture filtering would be corrupted.
(cherry picked from master, commit 6f915b10d5
)
2009-03-09 11:57:16 -06:00
Dan Nicholson
463ac421a5
autoconf: Restore _GNU_SOURCE for all Linux systems
...
This catches the linux-uclibc case and any others that were being set
prior to 98fcdf3f
. Fixes bug 20345.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com >
(cherry picked from commit ac55db1d7d
)
2009-03-06 07:59:00 -08:00
Brian Paul
6801240205
mesa: Reads must also be done with lock held.
...
Otherwise two threads might think each made the refcount go zero.
(cherry picked from master, commit 8bbb6b352a
)
2009-03-06 07:51:18 -07:00
Brian Paul
a22088b7d5
mesa: Fix typo.
...
Windows threads block if one over-unlocks them.
(cherry picked from master, commit f6159ba4d5
)
2009-03-06 07:50:55 -07:00
Brian Paul
e89c49147f
docs: update glext.h to version 46
2009-03-05 08:25:17 -07:00
Brian Paul
67634240d1
gl: update glext.h to version 46
2009-03-05 08:25:09 -07:00
Brian Paul
819b028a8e
mesa: fix sw fallback state validation bug
...
When a hw driver fell back to swrast, swrast wasn't always getting informed
of program changes. When fixed function is translated into shaders, flags
like _NEW_LIGHT, _NEW_TEXTURE, etc. should really signal _NEW_PROGRAM.
In this case, swrast wasn't seeing _NEW_PROGRAM when new fragment shaders
were generated.
(cherry picked from master, commit de1caa5507
)
2009-03-03 14:25:28 -07:00
Brian Paul
a43c30ef41
mesa: update fragResults array in arb_output_attrib_string()
...
Plus add some comments.
(cherry picked from master, commit a070937c00
)
2009-02-27 13:49:58 -07:00
Brian Paul
b65bfde84d
mesa: set bufObj->Pointer = NULL after unmapping
...
Also, ctx->Driver.UnmapBuffer can never be null, so remove conditional.
(cherry picked from master, commit 67025f7893
)
2009-02-27 13:13:31 -07:00
Brian Paul
c39e6917ac
mesa: if a buffer object is mapped when glDeleteBuffers() is called, unmap it
...
(cherry picked from master, commit a7f434b486
)
2009-02-27 13:05:51 -07:00
Brian Paul
c79079895f
mesa: fix incorrect error handling in glBufferDataARB()
...
If glBufferDataARB() is called while a buffer object is currently mapped
we're supposed to unmap the current buffer, then replace it. Don't generate
an error.
(cherry picked from master, commit 75e3ccf6a5
)
2009-02-27 12:58:07 -07:00
Alex Deucher
4480e631cd
R300: Add support for RS600 chips
2009-02-25 17:48:45 -05:00
Brian Paul
c32661c3ce
mesa: Build DRI by default on Linux/sparc
...
Signed-off-by: David S. Miller <davem@davemloft.net >
(cherry picked from master, commit 32dc28ac7a
)
2009-02-24 20:08:00 -07:00
Brian Paul
d5c06bb812
glsl: yet another swizzled expression fix
...
This fixes swizzled conditional expressions such "(b ? p : q).x"
(cherry picked from master, commit 00f0b05d5f
)
2009-02-24 08:32:01 -07:00
Brian Paul
9d5aa36239
glsl: fix another swizzle-related bug
...
This fixes the case of "infinitely" nested swizzles such as EXPR.wzyx.yxwz.xxyz
This doesn't appear in typical shaders but with function inlining and the
compiler's internal use of swizzles it can happen.
New glean glsl1 test case added for this.
(cherry picked from master, commit d9881356a6
)
2009-02-24 08:31:02 -07:00
Brian Paul
e3050c1777
docs: Haiku fixes
2009-02-23 08:16:09 -07:00
Brian Paul
06295ddbdd
mesa: fixes for building on Haiku
...
(cherry picked from master, commit 41172c0430
)
Conflicts:
src/mesa/main/dlopen.c
2009-02-23 08:15:43 -07:00
Brian Paul
e2092bb23c
demos: update multitex.c GLSL demo to use vertex arrays or glVertex-mode
...
Press 'a' to toggle drawing mode.
(cherry picked from master, commit 8e8b25c26a
)
2009-02-19 17:05:14 -07:00
Brian Paul
528836d0ad
util: added more functions to extfuncs.h
...
(cherry picked from master, commit 4c5f390328
)
2009-02-19 17:04:42 -07:00
Brian Paul
3511442e43
mesa: fix GLSL issue preventing use of all 16 generic vertex attributes
...
Only 15 actually worked before since we always reserved generic[0] as an
alias for vertex position.
The case of vertex attribute 0 is tricky. The spec says that there is no
aliasing between generic vertex attributes 0..MAX_VERTEX_ATTRIBS-1 and the
conventional attributes. But it also says that calls to glVertexAttrib(0, v)
are equivalent to glVertex(v). The distinction seems to be in glVertex-mode
versus vertex array mode.
So update the VBO code so that if the shader uses generic[0] but not gl_Vertex,
route the attribute data set with glVertex() to go to shader input generic[0].
No change needed for the glDrawArrays/Elements() path.
This is a potentially risky change so regressions are possible. All the usual
tests seem OK though.
(cherry picked from mesa, commit dea0d4d563
)
Follow-up: This patch doesn't seem to be as risky as noted above.
There have been no known regressions on Mesa/master because of it.
2009-02-19 17:01:17 -07:00
Brian Paul
d20c53b511
glsl: update program->InputsRead when referencing input attributes
...
This info will be used in the linker for allocating generic vertex attribs.
(cherry picked from master, commit 1cb7cd1292
)
2009-02-19 17:00:06 -07:00
Brian Paul
091cc122ad
glsl: asst improvements, clean-ups in set_program_uniform()
...
Move the is_boolean/integer_type() calls out of the loops.
Move the is_sampler_type() function near the bool/int functions.
Add a bunch of comments.
(cherry picked from master, commit c4ffbf009e
)
2009-02-18 17:53:08 -07:00
Brian Paul
c983abbb9e
glsl: fix inequality in set_program_uniform()
...
We were off by one when checking for too many uniform values.
(cherry picked from master, commit b9d8f717d2
)
2009-02-18 17:52:47 -07:00
Brian Paul
a0a81204c2
mesa: bump gl.h version comment to 7.4 (bug 20170)
2009-02-18 15:37:44 -07:00
Brian Paul
409d4f839c
glsl: fix link failure for variable-indexed varying output arrays
...
If the vertex shader writes to a varying array with a variable index,
mark all the elements of that array as being written.
For example, if the vertex shader does:
for (i = 0; i < 4; i++)
gl_TexCoord[i] = expr;
Mark all texcoord outputs as being written, not just the first.
Linking will fail if a fragment shader tries to read an input that's not
written by the vertex shader. Before this fix, this linker test could fail.
(cherry picked from master, commit dac19f17f3
)
2009-02-18 14:29:46 -07:00
Brian Paul
0ab36958ea
mesa: improved error msg
...
(cherry picked from master, commit 621c999d82
)
2009-02-18 13:41:12 -07:00
Brian Paul
c2445f43a3
mesa: increase MAX_UNIFORMS to 1024 (of vec4 type)
...
Old limit was 256. Note that no arrays are declared to this size.
The only place we have to be careful about raising this limit is the
prog_src/dst_register Index bitfields. These have been bumped up too.
Added assertions to check we don't exceed the bitfield in the future too.
(cherry picked from master, commit 5b2f8dc013
)
2009-02-18 13:40:57 -07:00
Brian Paul
f3d1c136b7
glsl: fix a swizzle-related regression
...
This new issue was exposed by commit 6eabfc27f1
(cherry picked from master, commit 212f41b80f
)
2009-02-18 13:37:31 -07:00
Brian Paul
dd10a8b09d
docs: 7.4 relnotes: report GLSL 1.20, fixed GLSL array index bug
2009-02-17 16:39:45 -07:00
Brian Paul
dd312366da
glsl: silence some uninit var warnings
...
(cherry picked from master, commit 9d49802b7a
)
2009-02-17 16:38:30 -07:00
Brian Paul
d2fe466ef3
mesa: turn on reporting of GLSL version 1.20
...
The new array features, precision/invariant/centroid qualifiers, etc. were
done a while back. The glGetString(GL_SHADING_LANGUAGE_VERSION) query returns
"1.20" now (for drivers that support it anyway).
(cherry picked from master, commit f59719c6c7
)
2009-02-17 16:37:41 -07:00
Brian Paul
fe5328bfad
glsl: fix mistake in a comment
...
(cherry picked from master, commit be8dd01678
)
2009-02-17 16:36:15 -07:00
Brian Paul
c0891dde07
glsl: fix an array indexing bug
...
This fixes a bug found with swizzled array indexes such as in "array[index.z]"
where "index" is an ivec4.
(cherry picked from master, commit 6eabfc27f1
)
2009-02-17 16:35:59 -07:00
Brian Paul
0e6d9c1a55
docs: recent 7.4 bug fixes
2009-02-16 20:35:12 -07:00
Brian Paul
5f74a66132
glsl: allow setting arrays of samplers in set_program_uniform()
...
Arrays of sampler vars haven't been tested much and might actually be broken.
Will need to be revisited someday.
Another fix for bug 20056.
(cherry picked from master, commit 2b4f0216bf
)
2009-02-16 20:30:49 -07:00
Brian Paul
46f8b62d5f
glsl: raise GL_INVALID_OPERATION for glUniform(location < -1)
...
location = -1 is silently ignored, but other negative values should raise
an error.
Another fix for bug 20056.
(cherry picked from master, commit 234f03e90a
)
2009-02-16 20:30:06 -07:00
Brian Paul
3e3e80c431
glsl: rework _mesa_get_uniform[fi]v() to avoid using a fixed size intermediate array
...
(cherry picked from master, commit 4ef7a93296
)
2009-02-16 20:29:36 -07:00
Brian Paul
0486d117e4
glsl: fix glUniform() array bounds error checking
...
If too many array elements are specified, they're to be silently ignored (don't
raise a GL error).
Fixes another issue in bug 20056.
(cherry picked from master, commit 2c1ea0720d
)
2009-02-16 20:28:57 -07:00
Brian Paul
29981c14da
glsl: fix incorrect size returned by glGetActiveUniform() for array elements.
...
Fixes one of the issues in bug 20056.
(cherry picked from master, commit 369d1859d7
)
2009-02-16 20:28:14 -07:00
Brian Paul
98d5efb2c5
glsl: use _slang_var_swizzle() in a few places to simplify the code.
...
(cherry picked from master, commit 285b500bb7
)
2009-02-16 20:26:58 -07:00
Brian Paul
77a44aafaf
mesa: another fix for program/texture state validation
...
This fixes a regression introduced in 46ae1abbac
Break program validation into two steps, do part before texture state
validation and do the rest after:
1. Determine Vertex/Fragment _Enabled state.
2. Update texture state.
3. Determine pointers to current Vertex/Fragment programs (which may involve
generating new "fixed-function" programs).
See comments in the code for more details of the dependencies.
(cherry picked from master, commit 537d3ed6f3
)
2009-02-16 20:23:17 -07:00
Brian Paul
8278c70716
mesa: fix/change state validation order for program/texture state
...
Program state needs to be updated before texture state since the later depends
on the former.
Fixes piglit texgen failure. The second time through the modes (press 't'
three times) we disable the fragment program and return to conventional texture
mode. State validation failed here because update_texture() saw stale fragment
program state.
(cherry picked from master, commit 46ae1abbac
)
2009-02-16 20:22:46 -07:00
Alan Hourihane
ac0955f5e2
demos: fix glxpixmap and call glXWaitGL before calling XCopyArea.
2009-02-16 11:55:47 +00:00
Alan Hourihane
4130c35ca8
dri2: support glXWaitX & glXWaitGL by using fake front buffer.
2009-02-16 11:48:24 +00:00
Brian Paul
d440647eb8
autoconf: Use include-fixed directory with makedepend on newer GCC
...
On newer GCC releases, the compiler's headers have been split between
the include and include-fixed directories. Add both if the directories
exist.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com >
Signed-off-by: Julien Cristau <jcristau@debian.org >
(cherry picked from master, commit a3d223f0d2
)
2009-02-13 09:10:09 -07:00
Brian Paul
7e8f2c56c0
mesa: fix logic error in computing enableBits in update_texture_state()
...
If we had a vertex shader but no fragment shader (i.e. fixed function) we
didn't get the right enabled texture targets.
Fixes blank/white texture problem.
(cherry picked from master, commit b46611633c
)
2009-02-07 12:04:15 -07:00
Brian Paul
a0880a152f
mesa: fix tnl->render_inputs_bitset setup for fragment program texcoords
...
Handle the case where there's no per-vertex texcoords but the fragment shader
needs texcoords.
Fixes piglit shaders/fp-generic/dph test.
(cherry picked from master, commit f6d23943cd
)
2009-02-07 12:03:37 -07:00
Brian Paul
4608a9172f
swrast: return (0,0,0,1) when sampling incomplete textures, not (0,0,0,0)
...
Fixes piglit shaders/fp-incomplete-tex test.
(cherry picked from master, commit 1df62651b2
)
Conflicts:
src/mesa/swrast/s_fragprog.c
Also updated the fetch_texel_lod(), fetch_texel_deriv() functions to match
those in git/master.
2009-02-07 12:02:22 -07:00
Brian Paul
d0e38f7ec0
glsl: replace assertion with conditional in _slang_pop_var_table()
...
We were hitting the assertion when we ran out of registers, which can happen.
Also, add some additional assertions and freshen up some comments.
(cherry picked from master, commit 0744805d58
)
2009-02-07 11:57:43 -07:00
Brian Paul
a69bdbbbdd
docs: fixed Windows build error, added MESA_GLX_FORCE_DIRECT env var
2009-02-03 15:40:16 -07:00
Brian Paul
88c97a2662
docs: document new MESA_GLX_FORCE_DIRECT env var for the Xlib driver
...
(cherry picked from master, commit 2f51be75c5
)
2009-02-03 15:39:13 -07:00
Brian Paul
ce9c69ddbc
xlib: use MESA_GLX_FORCE_DIRECT to make glXIsDirect() always return True
...
Some apps won't run w/ indirect rendering contexts.
Also, consolidate some context-init code in new init_glx_context() function.
(cherry-picked from master, commit 49e80bf6b1
)
2009-02-03 15:38:44 -07:00
Eric Anholt
e430fcb716
dri2: Avoid round-tripping on DRI2GetBuffers for the same set of buffers.
...
We only wanted to request when asked for the same set of buffers when a resize
has happened. We can just watch the protocol stream for a ConfigureNotify
and flag to do it then.
This is about a 5% win from doing two glViewport()s per frame in openarena.
2009-02-03 21:36:38 +00:00
Brian Paul
11a363e632
mesa: move code after decls. Fixes Window build failure.
...
(cherry picked from master, commit 92ced46eaf
)
2009-02-02 07:50:31 -07:00
Julien Cristau
9a3a20b2b9
debian/rules: on lpia, only build the i915 and i965 dri drivers
...
Based on Ubuntu changes, modified to also build swrast.
2009-01-31 23:04:06 +01:00
Julien Cristau
4672811541
debian/control: build the dri drivers on lpia
...
add lpia to the Architecture field for libgl1-mesa-dri{,-dbg} to match Ubuntu.
2009-01-31 22:30:15 +01:00
Julien Cristau
3cad3d28a5
mangle upstream version in debian/watch
...
Fix watch file to make uscan not consider release candidates as newer than
actual releases.
2009-01-31 22:07:51 +01:00
Brian Paul
41e63fbdb2
docs: recent bug fixes for 7.4
2009-01-30 16:09:58 -07:00
Brian Paul
b543401a5c
mesa: fix incorrect call to clear_teximage_fields() in _mesa_TexImage2D()
...
Fixes failed assertion / segfault for particular proxy texture tests.
(cherry picked from master, commit ea4b183b8c
)
2009-01-30 16:06:52 -07:00
Brian Paul
8c4f08fbad
mesa: add missing _mesa_reference_texobj() calls for texture array targets
...
(cherry picked from master, commit 7c48719a5f
)
2009-01-30 16:06:21 -07:00
Brian Paul
f3081a34d2
mesa: remove incorrect refcounting adjustment in adjust_buffer_object_ref_counts()
...
Fixes bug 19835. However, a more elaborate fix should be implemented someday
which uses proper reference counting for gl_array_object.
(cherry picked from master, commit 88e0b92a74
)
2009-01-30 16:05:51 -07:00
Julien Cristau
cff0971f87
Prepare changelog for upload
2009-01-30 20:00:37 +01:00
Julien Cristau
5ac4c69d83
More superfluous directories
2009-01-30 19:56:29 +01:00
Julien Cristau
a314c40cc4
Document my changes in debian/changelog
2009-01-30 19:42:38 +01:00
Julien Cristau
959fd6b8f6
Add back progs/fbdev
...
It was added to the tarballs in 22b0b2f47e
2009-01-30 19:34:47 +01:00
Julien Cristau
937f0da04a
Delete more directories that aren't in the tarball
2009-01-30 19:25:50 +01:00
Julien Cristau
73bc5967e2
Merge commit '5a458977113e4a0d3c389b03801cf6ce580d3935' into debian-experimental
2009-01-30 19:06:19 +01:00
Brian Paul
7b1d3cf392
docs: i965 fixes
2009-01-28 17:02:39 -07:00
Brian Paul
25515b557e
i965: fix bug in pass0_precalc_mov()
...
Previously, "in-place" swizzles such as:
MOV t, t.xxyx;
were handled incorrectly. Fixed by splitting the one loop into two loops so we
get all the refs before assigning them (to avoid potential clobbering).
(cherry picked from master/commit faa48915d2
)
2009-01-28 17:01:34 -07:00
Brian Paul
51625ff86e
i965: widen per-texture bitfields for 16 texture image units
...
(cherry picked from master/commit f78c388b6c
)
2009-01-28 17:01:03 -07:00
Brian Paul
4d8f661726
intel: check if stencil test is enabled in intel_stencil_drawpixels()
...
(cherry picked from master/commit 72ee0e247d
)
2009-01-28 17:00:23 -07:00
Brian Paul
efa69a2f66
intel: save/restore GL matrix mode in intel_meta_set_passthrough_transform(), intel_meta_restore_transform()
...
(cherry picked from master, commit 723648f2ee
)
2009-01-28 16:55:16 -07:00
Timo Aaltonen
a2dce49158
New changelog entry for 7.3
2009-01-25 17:51:16 +02:00
Timo Aaltonen
e4b28de803
Merge branch 'upstream-experimental' into debian-experimental
2009-01-25 17:30:47 +02:00
Brian Paul
30a6dd78d5
docs: fix typo
2009-01-22 10:39:05 -07:00
Brian Paul
9f75836308
mesa: set version to 7.4 for mesa_7_4_branch
2009-01-22 10:19:39 -07:00
Brian Paul
609cc9c139
docs: skeleton 7.4 release notes file
2009-01-22 10:18:04 -07:00
Brian Paul
e5aa89386d
docs: 7.3 md5 sums
2009-01-22 10:14:39 -07:00
Brian Paul
5a45897711
mesa: set version to 7.3
2009-01-22 10:14:24 -07:00
Brian Paul
faa6d8af59
docs: set 7.3 release date
2009-01-22 10:01:17 -07:00
Brian Paul
b6c41fd933
docs: assorted updates, link fixes
2009-01-22 10:01:17 -07:00
Eric Anholt
b8bd0b0ddc
i915: Add decode for PS in batchbuffers.
2009-01-21 14:03:56 -08:00
Eric Anholt
fc3971d800
i965: Remove gratuitous whitespace in INTEL_DEBUG=wm output.
2009-01-21 14:03:56 -08:00
Eric Anholt
046e88fc0b
i965: Use _mesa_num_inst_src_regs() instead of keeping a copy of its contents.
2009-01-21 14:03:56 -08:00
Julien Cristau
f5c47105db
Prepare changelog for upload
2009-01-21 19:01:24 +01:00
Julien Cristau
f1939c8685
Refresh patches 03 and 04.
2009-01-21 19:01:17 +01:00
Julien Cristau
3ac4d678ef
Delete some more files which aren't in the tarballs
2009-01-21 18:51:07 +01:00
Kristian Høgsberg
194d039f1e
[intel] Remove remaining references to intel_wait_flips().
...
Oops.
2009-01-21 11:47:01 -05:00
Thomas Henn
470e10dfaa
windows: fix output dir for glut project file
2009-01-21 09:32:40 -07:00
Brian Paul
8c7135ee14
swrast: fix redundant texture application in affine_textured_triangle().
...
This function does simple texture mapping so disable normal texture mapping
before we call _swrast_write_rgba_span() so that we don't do it twice.
2009-01-21 09:05:02 -07:00
Brian Paul
4683cab29a
mesa: add some debug assertions to detect null current texture object pointers
...
See bug #17895 . These assertions could be removed when this is resolved.
2009-01-21 08:18:07 -07:00
Karl Schultz
787a001a67
windows: another round of VC8 project file updates
...
New static configs generate DLLs that do not have a dependency on the MSCVR*
DLL's.
2009-01-21 07:59:11 -07:00
Brian Paul
dd92f483b0
Revert "windows: new VC8 projects statically linked against libcmt"
...
This reverts commit bbda892c55
.
Static configs rolled into regular project files (in next commit).
Provided by Karl Schultz.
2009-01-21 07:57:45 -07:00
Brian Paul
65118a51b6
docs: document glXMakeContextCurrent() and Windows fixes
2009-01-20 15:36:01 -07:00
Ian Romanick
ab9b4e1f59
Fix issues with glXMakeContextCurrent and glXMakeCurrentReadSGI
...
There were several bugs in the infrastructure for these two routines.
1. GLX_ALIAS was incorrectly used. The function and its alias must be
identical! glXMakeContextCurrent / glXMakeCurrentReadSGI and
MakeContextCurrent had different parameters. This caused the last
parameter of MakeContextCurrent to get random values.
2. We based the implementation of glXMakeContextCurrent on the manual
page instead of the GLX spec. The GLX spec says that
glXMakeContextCurrent can be passed a Window as a drawable. When this
happens, it will behave just like glXMakeCurrentReadSGI or
glXMakeCurrent.
3. If there was a problem finding or creating the DRI drawable,
MakeContextCurrent would crash instead of returning an error.
This commit fixes all three issues, and fixes bug #18367 and bug #19625 .
2009-01-20 13:55:18 -08:00
Julien Cristau
fcfec66865
update changelog
2009-01-20 18:50:10 +00:00
Julien Cristau
53426d7113
Merge tag 'mesa_7_3_rc3' into debian-experimental
...
Conflicts:
progs/tests/Makefile
2009-01-20 18:49:21 +00:00
Timo Aaltonen
39e6d0d810
[intel] Go back to using the typedef for the sarea struct
...
The upstream linux kernel headers and libdrm kernel headers disagree on the
tag name for the sarea struct: _drm_i915_sarea vs drm_i915_sarea. They
both typedef it to drm_i915_sarea_t though, so just use that.
2009-01-20 11:52:32 -05:00
Owain G. Ainsworth
b5da7feee0
Remove intel pageflipping support in its entirety.
...
It's been broken and deprecated for a while, so it's time to die. This has the
wonderful benefit of cleaning up the code a fair amount; making it marginally
less twisty.
I'm unsure if the for loops in IntelWindowMoved are still needed.
2009-01-20 11:52:32 -05:00
Brian Paul
0f548dbc98
glsl: silence unused var warnings
2009-01-20 09:21:32 -07:00
Brian Paul
9d216be8cf
mesa: silence uninitialized var warnings
2009-01-20 09:20:41 -07:00
Brian Paul
eb26cc6cf5
mesa: silence compiler warning at -O2
2009-01-20 09:17:12 -07:00
Brian Paul
bb63a663b1
mesa: bump version to 7.3-rc3
2009-01-20 09:13:41 -07:00
Brian Paul
dace4e3e2a
mesa: inlclude whole windows/VC8/ directory in tarballs
2009-01-20 09:13:06 -07:00
Thomas Henn
bbda892c55
windows: new VC8 projects statically linked against libcmt
2009-01-20 09:07:01 -07:00
Karl Schultz
61a387dca1
windows: more VC8 project file updates
...
Make some compiler flags per-file.
Remove driverfuncs.c from osmesa project.
2009-01-20 09:07:01 -07:00
Thomas Hellstrom
437fa85ba3
Add a comment about _tnl_emit_indexed_vertices_to_buffer.
2009-01-20 11:40:51 +01:00
Thomas Hellstrom
b00477acf3
tnl: Add a utility to emit indexed vertices to a DMA buffer.
...
This utility is useful for hardware that doesn't support HW index buffers.
It's a bit inefficient but appears to give a substantial performance gain,
as we can emit tri strips that would otherwise be split into triangles.
2009-01-20 11:15:57 +01:00
Thomas Hellstrom
7374285f07
Fix store texel for argb4444.
2009-01-20 11:13:38 +01:00
Thomas Hellstrom
5c84a1032c
Fix store texel for argb8888_rev.
2009-01-20 11:13:05 +01:00
Thomas Hellstrom
dbda49a9e6
Add RGBA4444 and RGBA5551 texture formats.
2009-01-20 11:12:17 +01:00
Thomas Hellstrom
11351f0c8a
dri1: Add a macro to validate two dri drawables in one go.
...
Dri drivers often may validate first a write drawable and then a read
drawable ("readable"). However, the hardware lock may be unlocked when
validating the readable, causing the write drawable status to be stale.
Drivers should use this macro instead when validating two drawables.
2009-01-20 11:07:10 +01:00
Brian Paul
a5b5bc9f95
mesa: fix build of stand-alone glslcompiler driver
2009-01-19 17:50:44 -07:00
Brian Paul
f97792421b
tests: test pseudo-XOR blend mode.
...
GL_XOR logicop mode can be approximated with blending by computing 1 - dst.
Here's a couple test programs for that.
2009-01-19 12:09:40 -07:00
Alan Hourihane
396711b840
dri: add fake front definitions
2009-01-19 15:41:19 +00:00
Thomas Henn
dbd8e4066b
windows: updated VC8 project files
2009-01-19 08:23:22 -07:00
Brian Paul
b7f802eca2
glx: gcc 2.95 build fix (move declaration before code)
...
Adapted from patch by Matthieu Herbb <matthieu.herrb@laas.fr >
2009-01-18 10:00:34 -07:00
Timo Aaltonen
1d4756de06
Update the changelog.
2009-01-16 23:12:14 +02:00
Timo Aaltonen
c1abb821f9
Merge commit 'mesa_7_3_rc2' into debian-experimental
2009-01-16 23:05:20 +02:00
Brian Paul
a61a1a8181
i965: fix polygon culling bug when rendering to a texture/FBO
...
Since we use an inverted viewport transformation for render to texture, that
inverts front/back polygon orientation.
Now glCullFace(GL_FRONT / GL_BACK) works correctly.
2009-01-16 13:33:19 -07:00
Brian Paul
345a08a77f
intel: added intel_rendering_to_texture() helper function.
...
When we're rendering to textures we have to invert the viewport transformation.
This helper cleans up that test and can be used elsewhere...
2009-01-16 13:31:04 -07:00
Brian Paul
12c6d28cc7
mesa: remove GL_DEPTH_TEST + no depth buffer test
...
One could enable depth testing before binding an FBO that has a depth buffer
so this test is no longer useful or correct.
2009-01-16 13:25:41 -07:00
Brian Paul
e442fe5ba5
glsl: fix broken sampler assignments
2009-01-16 09:30:58 -07:00
Xiang, Haihao
66a4f5cf9a
i915: fallback on transfer mode
2009-01-16 16:06:33 +08:00
Karl Schultz
a740858fc0
windows: updated VC8 project file
2009-01-15 11:32:47 -07:00
Karl Schultz
e7c988d065
windows: updated mesa.def file
2009-01-15 07:05:31 -07:00
Brian Paul
4a8356209d
glsl: use _mesa_sprintf()
2009-01-15 07:05:30 -07:00
Brian Paul
e1ba29ea19
glsl: move declaration before code
2009-01-15 07:05:30 -07:00
Alan Hourihane
fbf13bcb8a
mesa: check frambuffer complete status before rendering
2009-01-15 11:56:00 +00:00
Brian Paul
8f8435637d
mesa: bump version to 7.3-rc2
2009-01-14 17:05:26 -07:00
Brian Paul
7d08091767
glsl: fix comment
2009-01-14 17:05:26 -07:00
Brian Paul
b5f32e1d5a
glsl: minor clean-up for rect sampler test
2009-01-14 17:05:26 -07:00
Brian Paul
0dffd22349
r300: work-around FRAG_BIT_FOGC warning/error
...
See bug 17929.
Fog doesn't actually work, but the often complained about warning is
silenced.
2009-01-14 16:49:24 -07:00
Brian Paul
947d1c5b2a
i965: asst. fixes, work-arounds for FBOs and render to texture
...
OpenGL allows mixing and matching depth and stencil renderbuffers in
framebuffer objects while the hardware really only supports interleaved
depth/stencil buffers. This makes for some tricky buffer management.
An extra wrinkle is the situation where the user allocates a 16bpp depth
texture or renderbuffer then tries to render to it along with a stencil
buffer. We'd have to promote the 16bpp Z values to 24-bit Z values and
mix in the stencil values to setup the depth/stencil renderbuffer.
There's no support for that now, so always allocate 32bpp depth textures/
renderbuffers for now.
2009-01-14 16:49:24 -07:00
Brian Paul
c7f43543af
i965: fix incorrect renderbuffer DataType assignment
2009-01-14 16:49:24 -07:00
Brian Paul
5912cdff3e
i965: fix some FBO depth/stencil assertions
2009-01-14 16:49:24 -07:00
Ian Romanick
03188b09e0
intel: SW fallback maps texture images, not texture coordinates
2009-01-14 12:48:22 -08:00
Brian Paul
fae9604727
glsl: propagate pragma info down into compiler from preprocessor
2009-01-14 12:16:00 -07:00
Brian Paul
aac4a0509e
windows: remove reference to swizzle.c file
2009-01-14 12:07:25 -07:00
Brian Paul
b5f89e5f17
glsl: simplify IR storage for samplers
...
Don't overload the Size field with the texture target, to avoid confusion.
2009-01-14 11:58:45 -07:00
Brian Paul
c12d24b513
mesa: fix incorrect transformation of GL_SPOT_DIRECTION
...
This was changed between GL 1.0 and 1.1. Mesa still had the 1.0 behaviour.
2009-01-14 11:51:30 -07:00
Ian Romanick
2549c26a8b
Treat image units and coordinate units differently.
...
Previously MaxTextureUnits was used to validate both texture image
units and texture coordinate units in fragment programs. Instead, use
MaxTextureCoordUnits for texture coordinate units and
MaxTextureImageUnits for texture image units.
Fixes bugzilla #19468 .
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
Reviewed-by: Brian Paul <brianp@vmware.com >
2009-01-14 10:09:01 -08:00
Alan Hourihane
a98dccca36
glsl: fix regression from sampler arrays commit
2009-01-14 16:34:19 +00:00
Brian Paul
1b3e3e6b84
i965: indentation fixes
2009-01-14 08:34:07 -07:00
Brian Paul
49b53407c7
i965: allow larger AA points on fallback path
2009-01-14 08:34:06 -07:00
Brian Paul
d911e3e24f
i965: fix indentation
2009-01-14 08:34:06 -07:00
Brian Paul
658ab3c3ae
i965: comment for emit_kil()
2009-01-14 08:34:06 -07:00
Brian Paul
8f7349dbb4
mesa: put _NV suffix on a few opcodes
2009-01-14 08:34:06 -07:00
Brian Paul
d687476edd
i965: fix indentation
2009-01-14 08:34:06 -07:00
Xiang, Haihao
c157a5bb91
intel: bump driver date
2009-01-14 09:32:55 +08:00
Alan Hourihane
14eca6b573
glsl: fix a comment typo
2009-01-14 00:12:59 +00:00
Alan Hourihane
ef0e0f2550
glsl: support sampler arrays.
2009-01-14 00:12:33 +00:00
Brian Paul
34d17d2bdc
docs: #pragma now handled
2009-01-13 15:09:40 -07:00
Brian Paul
01a0938776
glsl: add preprocessor support for #pragma
...
Two forms are supported:
Pragmas are silently ignored at this time.
2009-01-13 15:09:40 -07:00
Ian Romanick
1f47388dfe
Add language about implicit flush and command completion
...
Copied language from the glXSwapBuffers manual page about the implicit
glFlush and expected command completion. This just codifies what
people already expect from glXCopySubBufferMESA. The intention of
this command is to work like glXSwapBuffers but on a sub-rectangle of
the drawable.
Acked-by: Brian Paul <brianp@vmware.com >
2009-01-13 12:36:03 -08:00
Brian Paul
34500a6da5
docs: fixes since 7.3-rc1
2009-01-13 09:03:43 -07:00
Karl Schultz
00c02626d8
windows: try to create a context in wglCreateLayerContext()
2009-01-13 09:02:04 -07:00
Brian Paul
eeeed45c2c
i965: fix glDrawPixels Z coordinate in intel_texture_drawpixels().
...
As for glBitmap, it needs to be an NDC coord in [-1,1].
2009-01-12 15:47:57 -07:00
Brian Paul
3a5463d158
i965: fix broken glBitmap + depth test
...
When we use the do_blit_bitmap() function, it seems the fragment Z is always
1.0. If depth testing is on, that means that bitmap fragments are often
occluded by other rendering. So, the bitmap doesn't appear even if
rasterpos.Z==0.
The fix is to use the intel_texture_bitmap() path when depth testing is on.
Also, fix the incorrect Z coordinate. It needs to be an NDC value in [-1,1].
2009-01-12 15:43:54 -07:00
Brian Paul
de35989cde
i965: fix broken ARB fp fog options
...
Just call _mesa_append_fog_code() if the fragment program's FogOption is
not GL_NONE.
This allows us to remove some unnecessary i965 fog code.
Note, the arbfplight.c demo can be used to test this (see DO_FRAGMENT_FOG).
2009-01-12 14:24:45 -07:00
Dan Nicholson
29f603a270
autoconf: Only _GNU_SOURCE feature test macro needed on gnu systems
...
According to feature_test_macros(7), _GNU_SOURCE encompasses all the
other feature macros we were setting, so we can just dispose of them.
2009-01-12 11:10:31 -08:00
Julien Cristau
7f7fc3e3af
mesa: match against *-gnu* instead of *-gnu in configure.ac
...
Fixes build on arm-linux-gnueabi
2009-01-12 11:08:02 -08:00
Thomas Henn
a0318d7f8e
windows: updated VC8 project files
2009-01-12 10:56:42 -07:00
Brian Paul
06fdb6a74c
glsl: better fix for for-loop scope issue (commit 6333005f7a
)
2009-01-12 08:52:54 -07:00
Brian Paul
88fdddcbbe
windows: added new sources for 7.3 (may be more, needs testing)
2009-01-12 08:36:21 -07:00
Brian Paul
1598be5083
mesa: add osmesa.pc.in to tarball list
2009-01-12 08:36:21 -07:00
Matthieu Herrb
436024561a
Build fixes for gcc 2.95
2009-01-11 16:56:34 -07:00
Matthieu Herrb
0f0922f93c
Big endian fixes.
2009-01-11 16:44:54 -07:00
Matthieu Herrb
33f6dc3c33
build fix on big endian OpenBSD architectures.
2009-01-11 16:44:52 -07:00
Matthieu Herrb
356428d4e4
replace nearbyint() by rint() for now.
2009-01-11 16:44:50 -07:00
Owain G. Ainsworth
b4866f8a52
Fix build with GCC 2.95.
2009-01-11 16:44:40 -07:00
Matthieu Herrb
297a9606ea
__builtin_expect is a gcc 3.x feature. define it out for gcc 2.95.
...
Patch suggested by miod@. Thanks.
2009-01-11 16:44:36 -07:00
Brian
44557bf065
mesa: require libdrm 2.4.3 in configure.ac
2009-01-10 16:32:32 -07:00
Julien Cristau
88083e9bab
Prepare changelog for upload
2009-01-10 22:34:36 +01:00
Julien Cristau
47e54545ed
Delete some now unused code from debian/rules.
2009-01-10 22:13:17 +01:00
Julien Cristau
54885ff0ad
Delete unused configs/debian-*, and install-source.sh script.
...
We've switched to using autoconf, and mesa-swx11-source is gone.
2009-01-10 21:55:19 +01:00
Julien Cristau
502fbe7cb3
Merge branch 'debian-unstable' into debian-experimental
...
Conflicts:
debian/changelog
debian/rules
2009-01-10 21:42:57 +01:00
Julien Cristau
08fdb497fb
Merge commit 'origin/upstream-unstable' into debian-experimental
2009-01-10 21:38:10 +01:00
Julien Cristau
2a6711c0e5
add bug closers
2009-01-10 21:02:55 +01:00
Julien Cristau
382a8f6e29
Require libdrm-dev 2.4.3.
2009-01-10 20:41:16 +01:00
Julien Cristau
a713ba4399
Update changelog
2009-01-10 20:31:20 +01:00
Julien Cristau
5359febc9b
Merge tag 'mesa_7_3_rc1' into debian-experimental
...
Conflicts:
progs/tests/Makefile
progs/tests/floattex.c
2009-01-10 20:30:41 +01:00
Brian Paul
f1455ca5f4
mesa: omit old headers from tarball
2009-01-10 12:21:37 -07:00
Brian Paul
834db82153
docs: document deprecated/removed headers/interfaces
2009-01-10 12:09:08 -07:00
Brian Paul
ef193c10e7
mesa: remove old GLView.h header for BeOS
2009-01-10 12:07:58 -07:00
Brian Paul
c3a00a728b
mesa: remove deprecated headers from Makefile.am
2009-01-10 12:06:29 -07:00
Brian Paul
287102ddcc
mesa: deprecate GL/amesa.h header (allegro driver)
2009-01-10 12:04:39 -07:00
Brian Paul
f5979b0c15
mesa: deprecate the GL/fxmesa.h header
2009-01-10 12:01:40 -07:00
Brian Paul
d25cc16efa
mesa: remove the ancient include/GL/ugl*.h headers
2009-01-10 12:00:27 -07:00
Brian Paul
1636328b0a
xmesa: deprecate the "XMesa" interface
...
Move the include/GL/xmesa*.h files to src/mesa/drivers/x11/ so they're no
longer considered public.
2009-01-10 11:57:13 -07:00
Brian Paul
2c56dd7757
docs: prerequisite updates
2009-01-10 11:52:55 -07:00
Brian Paul
6333005f7a
glsl: force creation of new scope for for-loop body
...
Fixes regression in progs/demos/convolution.c due to loop unrolling.
This also allows the following to be compiled correctly:
for (int i = 0; i < n; i++) {
int i;
...
}
This fix is a bit of a hack, however. The better fix would be to change
the slang_shader.syn grammar. Will revisit that...
2009-01-10 11:40:20 -07:00
Brian Paul
1d352b42a1
glsl: replace 0/1 with GL_FALSE/GL_TRUE
2009-01-10 11:39:05 -07:00
Ian Romanick
9939a306f7
swrast: Fix GL_ATI_separate_stencil
...
GL_ATI_separate_stencil is enabled by default for software
rasterizers, but the extension functions weren't hooked up to the
dispatch table.
2009-01-09 16:44:08 -08:00
Brian Paul
ca03e881a8
glsl: make minimum struct size = 2, not 1
...
1-component structs such as "struct foo { float x; }" could get placed at
any position within a register. This caused some trouble computing the
field offset which assumed all struct objects were placed at R.x.
It would be unusual to hit this case in normal shaders.
2009-01-09 09:59:49 -07:00
Brian Paul
4497a5a57d
mesa: 7.3-rc-1 Makefile changes
2009-01-08 17:21:20 -07:00
Brian Paul
f7b4c2cca9
mesa: latest glxext.h header, no version change
2009-01-08 17:20:41 -07:00
Brian Paul
08fdc741bc
mesa: import glext.h version 44
2009-01-08 17:20:18 -07:00
Brian Paul
d0c2cbd257
docs: dri2proto, libdrm tweaks
2009-01-08 17:19:51 -07:00
Brian Paul
acd99f67cc
glsl: fix typo in the vec2 += operator function
2009-01-08 17:07:28 -07:00
Brian Paul
0713e9da73
mesa: set version string to 7.3-rc1
2009-01-08 16:16:36 -07:00
Brian Paul
2c0ce92e8a
docs: updated Cell docs, from gallium-0.2 branch
2009-01-08 16:15:31 -07:00
Brian Paul
1ed9b1ec90
docs: more 7.3 doc updates
2009-01-08 16:14:19 -07:00
Brian Paul
11ade9a3d1
docs: import 7.2 relnotes, start on 7.3 relnotes
2009-01-08 16:12:23 -07:00
Brian Paul
730a407ca2
glsl: fix broken +=, -=, *=, /= operators
...
These functions need to return the final computed value.
Now expressions such as a = (b += c) work properly.
Also, no need to use __asm intrinsics in these functions. The resulting
code is the same when using ordinary arithmetic operators and is more legible.
2009-01-08 15:35:23 -07:00
Brian Paul
19c877c327
mesa: fix off-by-one bug in _mesa_delete_instructions()
2009-01-08 15:35:23 -07:00
Eric Anholt
83a74521cf
i965: Fix GLSL FS DPH to return the right value instead of src0.w * src1.w.
2009-01-07 20:35:25 -08:00
Eric Anholt
6d2cf395f4
i965: Remove worrisome comment about _NEW_PROGRAM signaling fp change.
...
Everything now depends on either BRW_NEW_FRAGMENT_PROGRAM or
BRW_NEW_VERTEX_PROGRAM.
2009-01-07 20:35:24 -08:00
Eric Anholt
8fb727548a
mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.
...
There was a note in state.c about _Active deserving to die, and there were
potential issues with it due to i965 forgetting to set _UseTexEnvProgram.
Removing both simplifies things.
Reviewed-by: Brian Paul <brianp@vmware.com >
2009-01-07 20:34:46 -08:00
Eric Anholt
b9b482bd8d
i965: Remove dead brw_vs_tnl.c
2009-01-07 20:34:43 -08:00
Brian Paul
f68f94c2bc
i965: allow gl_FragData[0] usage when there's only one color buffer
...
If gl_FragData[0] is written but not gl_FragCOlor, use the former.
2009-01-07 18:45:49 -07:00
Brian Paul
bc7d2c4f51
mesa: additional case in file_string()
2009-01-07 18:44:41 -07:00
Brian Paul
9629be5e07
glsl: pass GLcontext::Extension info down into GLSL preprocessor
...
Now the #extension directives can be handled properly.
2009-01-07 18:44:00 -07:00
Brian Paul
176464b14b
glsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITY
2009-01-07 18:41:54 -07:00
Brian Paul
d1860bcd0a
glsl: check that the fragment shader does not write both gl_FragColor and gl_FragData[]
2009-01-07 18:22:56 -07:00
Brian Paul
95fa98d61a
i965: init dst reg RelAddr field to zero
2009-01-07 15:06:06 -07:00
Eric Anholt
8112c9e2cc
i965: Note when we drop saturate mode on the floor in a VP.
2009-01-07 12:41:55 -08:00
Eric Anholt
f53d9913ac
i965: Add support for LRP in VPs.
...
Bug #19226 .
2009-01-07 12:40:16 -08:00
José Fonseca
b3c7f7466c
mesa: Add _mesa_snprintf.
...
On Windows snprintf is renamed as _snprintf.
(cherry picked from commit f8f9a1b620
)
2009-01-07 09:00:05 -07:00
Brian Paul
510ed7f51e
glsl: disable some unused functions (but don't remove just yet)
2009-01-07 08:56:10 -07:00
Brian Paul
a8542200b3
glsl: also unroll loops with variable declarations such as "for (int i = 0; ..."
2009-01-07 08:54:09 -07:00
Brian Paul
cea7f7b763
glsl: remove dead code
2009-01-07 08:32:21 -07:00
Brian Paul
1a414a4dbe
mesa: OSMesa Makefile fixes (use LIB_DIR)
2009-01-07 08:25:59 -07:00
Brian Paul
0b0d0dcdef
glsl: loop unroll adjustments
...
Add a "max complexity" heuristic to allow unrolling long loops with small
bodies and short loops with large bodies.
The loop unroll limits may need further tweaking...
2009-01-06 17:36:20 -07:00
Brian Paul
1fa978c891
glsl: implement loop unrolling for simple 'for' loops
...
Loops such as this will be unrolled:
for (i = 0; i < 4; ++i) {
body;
}
where 'body' isn't too large.
This also helps to fix the issue reported in bug #19190 . The problem there
is indexing vector types with a variable index. For example:
vec4 v;
v[2] = 1.0; // equivalent to v.z = 1.0
v[i] = 2.0; // variable index into vector!!
Since the for-i loop can be unrolled, we can avoid the problems associated
with variable indexing into a vector (at least in this case).
2009-01-06 17:24:23 -07:00
Brian Paul
338ae34d22
mesa: Move var declaration to top of scope.
...
(cherry picked from commit 3740a06e28
)
2009-01-06 14:29:08 -07:00
Brian Paul
814bc5ccda
mesa: fix GL_DEPTH_CLEAR_VALUE casting
...
(cherry picked from commit d14d494dcd
)
2009-01-06 14:24:16 -07:00
Brian Paul
a8ee35c1c5
mesa: remove dri_sarea.h, add glcore.h in Makefile
2009-01-06 07:36:11 -07:00
Xiang, Haihao
f1f022dbb1
mesa: Fix the size per pixel for packed pixel format data type.
2009-01-06 15:37:45 +08:00
Xiang, Haihao
241c0bfc98
mesa: Fix the number of components for GL_UNSIGNED_SHORT_1_5_5_5_REV. (bug #19390 )
2009-01-06 15:34:51 +08:00
Xiang, Haihao
7627c7f5df
dri: correct the damage.
...
Fixes bug #17234
2009-01-06 11:22:19 +08:00
Brian Paul
c5c9241cca
mesa: add GLushort cases for render to texture (Z-buffers)
2009-01-05 18:12:23 -07:00
Brian Paul
9736d8f033
mesa: fix a GLSL swizzled writemask bug
...
This fixes cases such as:
vec4 v4;
vec2 v2;
v4.xz.yx = v2;
The last line now correctly compiles into MOV TEMP[1].xz, TEMP[0].yyxw;
Helps to fix the Humus Domino demo. See bug 19189.
2009-01-05 13:16:09 -07:00
Brian Paul
0d797365de
i965: implement OPCODE_TRUNC (round toward zero) on vertex path.
...
Also, fix some RNDD vs. RNDZ confusion elsewhere.
2009-01-05 10:09:28 -07:00
Tom Fogal
4469355df2
glu: Add mangled symbols to export list
...
This adds all of the `mglu' symbols to the list of symbol exports
for GLU. Without this patch, mangled GLU symbols are considered
`internal' symbols, and calling any results in undefined references.
2009-01-05 08:00:16 -07:00
Brian Paul
724ed5b84b
mesa: fix warning about possibly undefined var in GLSL compiler
2009-01-02 17:30:08 -07:00
Brian Paul
1fad6ccb75
mesa: fix another "out of samplers" problem
...
Now only the samplers that are actually used by texture() functions are
saved in the uniform variable list. Before, we could run out of samplers
if too many were declared while only some of them were actually used.
2009-01-02 12:28:37 -07:00
Brian Paul
4a6ad999ea
i965: increase number of texture samplers to 16
...
This lets GLSL shaders use up to 16 samplers.
Fixed function is still limited to 8 textures.
Tested with progs/glsl/samplers.c
2009-01-01 14:05:30 -07:00
Brian Paul
3b891a502b
i965: comments, clean-ups, re-order some functions
2009-01-01 14:05:30 -07:00
Brian Paul
32e03c4a2f
i965: added OPCODE_NRM3/4
2009-01-01 14:05:30 -07:00
Brian Paul
e262da8040
i965: fix comment
2009-01-01 14:05:30 -07:00
Brian Paul
914fcbafdb
i965: indentation and formatting fixes
2009-01-01 14:05:30 -07:00
Brian Paul
131ac5b465
i965: implement OPCODE_NRM3/NRM4
2009-01-01 14:05:30 -07:00
Brian Paul
23b0ad4d7e
i965: whitespace, comment changes
2009-01-01 14:05:30 -07:00
Brian Paul
1d03f2834f
mesa: comments, whitespace changes
2009-01-01 14:05:30 -07:00
Brian Paul
46b8fe00c9
demos: added progs/glsl/samplers.c to test all available texture samplers
2009-01-01 14:02:17 -07:00
Brian Paul
dfada459aa
mesa: updated comments about GLSL constants
2009-01-01 08:07:54 -07:00
Brian Paul
e9b34885b8
mesa: increase max texture image units and GLSL samplers to 16
...
The max texture coord units is still 8. All the fixed-function paths are
still limited to 8 too. But GLSL shaders can use more samplers now.
Note that some texcoord-related data structures are declared to be 16
elements in size rather than 8. This just simplifies the code in a few
places; the extra elements aren't accessible to the user.
These changes haven't been extensively tested yet, but sanity checking has
been done.
It should be possible to increase the max image units/samplers to 32 without
doing anything special. Beyond that we'll need longer bitfields in a few
places.
2008-12-31 12:00:17 -07:00
Eric Anholt
bfebeffc00
intel: Share passthrough transform setup between glBitmap and glDrawPixels.
...
The DrawPixels path was missing glViewport care, so blender's toolbar icons
would go to the wrong places.
Bug #19118 .
2008-12-31 00:35:17 -08:00
Eric Anholt
e1a9217554
intel: Add support for glBitmap as metaops using GL calls.
...
This lets us avoid software fallbacks when clients forget to turn some state
off (engine demo) or just do crazy things to test conformance (OGLC).
This should probably be brought into mesa generic code so other drivers can
make use of it.
Bug #19016 .
2008-12-31 00:10:29 -08:00
Brian Paul
e8d7db31e2
mesa: fix bug in evaluation of structure fields
...
Fixes incorrect size information. See bug 19273.
2008-12-30 17:50:39 -07:00
Brian Paul
c6537ac8b8
mesa: allow variable indexing into the predefined uniform variable arrays
...
This allows code such as "vec4 a = gl_LightSource[i].ambient;" to work.
When a built-in uniform array is indexed with a variable index we need to
"unroll" the whole array into the parameter list (aka constant buffer) because
we don't know which elements may be accessed at compile-time. In the case of
the gl_LightSource array of size [8], we emit 64 state references into the
parameter array (8 elements times 8 vec4s per gl_LightSourceParameters
struct).
Previously, we only allowed constant-indexed references to uniform arrays
(such as gl_LightSource[2].position) which resulted in a single state reference
being added to the parameter array, not 64. We still optimize this case.
Users should be aware that using "gl_LightSource[i].ambient" in their shaders
is a bit expensive since state validation will involve updating all 64
light source entries in the parameter list.
2008-12-30 17:11:32 -07:00
Brian Paul
ca0540e25c
mesa: better error message when running out of GLSL samplers
2008-12-30 17:03:09 -07:00
Brian Paul
6f346ec0b8
mesa: comments for some state vars
2008-12-30 17:00:36 -07:00
Brian Paul
432e9fa852
mesa: increase max constants/uniforms to 256 (vec4 vectors)
2008-12-30 17:00:06 -07:00
Brian Paul
49a3fabed8
mesa: updated compilation documentation
2008-12-30 07:57:16 -07:00
Brian Paul
c9122072fc
demos: minor fixes to twoside.c glsl demo
2008-12-30 07:24:19 -07:00
Xiang, Haihao
0c4346e632
intel: disable ATI_texture_env_combine3 for i830( and related device).
...
Thanks to Eric for pointing it out.
2008-12-30 11:25:45 +08:00
Eric Anholt
6c01500228
dri: Fix driWaitForMSC32 when divisor >= 2 and msc < 0.
...
We'd come up with a negative remainder, while we were looking for the positive
version of it in the loop conditional. And, since the "did we hit our target"
break was disabled for the target_msc == 0 ("Just make the divisor/remainder
work") path, we'd never exit.
Simplify the code by just using int64_t all over instead of trying to do it
in a u32 space.
2008-12-29 12:09:24 -08:00
Alex Deucher
c40cd2ccdd
R300: missing semicolon
2008-12-29 12:28:12 -05:00
Xiang, Haihao
0674a23854
intel: enable ATI_texture_env_combine3. Fixes #17707
2008-12-29 09:32:51 +08:00
Dave Airlie
0d1f90c75e
r300: remove the unknowns from the indx_buffer code
2008-12-28 16:48:36 +10:00
Xiang, Haihao
129b6bc4e3
i915: separate the fog term from the specular color term.
...
Previously fog parameter and specular color are packed into the
same dword. Note specular color should be packed in BGRA for device,
so if fog parameter and specular color all are present, fog parameter
will dirty the alpha term of specular color. This fixes rendering
issue when playing 'Yo Frankie' on 915/945.
2008-12-24 09:26:46 +08:00
Eric Anholt
15b2e0d138
intel: Fix glBitmap clipping for DRI1.
2008-12-23 15:01:53 -08:00
Dave Airlie
b359350017
Remove third buffer support from Mesa.
...
This is part of the deprecated pageflipping infrastructure.
2008-12-23 15:01:53 -08:00
Ian Romanick
f83f5ec8f5
Add do_row_3d for mipmapping 3D textures
...
Previously 3D textures were mipmapped using multiple passed through
the 2D mipmap generation code. This had 3 disadvantages. First, the
extra passes were slow. Second, this required the allocation of a
temporary buffer to hold intermediate data. Third, and most
important, the extra passes caused loss of additional bits due to
integer division / bit-shifting.
With this change, our mipmapgen conformance test passes for
non-compressed texture formats.
2008-12-19 13:06:53 -08:00
Ian Romanick
a330933bb7
Fix typeo in mipmap filter for GL_UNSIGNED_SHORT_1_5_5_5_REV
2008-12-19 13:06:53 -08:00
Ian Romanick
7e04272690
965 / GLSL: Use full precision for EXP instruction
...
The partial precision mode doesn't have quite enough bits of precision
to pass conformance tests.
2008-12-19 13:06:53 -08:00
Ian Romanick
962fa6bbc1
GLSL: The LOG2 macro doesn't have enough precision
...
It looks like the LOG2 macro only has 8 or 9 bits of precission, but
the ARB_vertex_program spec says "accurate to at least 10 bits".
2008-12-19 13:06:53 -08:00
Eric Anholt
1db6371304
intel: Fix glBitmap top/bottom clipping.
...
Bug #19139 .
2008-12-19 13:05:50 -08:00
Eric Anholt
e67350da34
intel: Don't forget the source bitmap size when clipping the size we draw.
2008-12-19 13:04:29 -08:00
Eric Anholt
b9752a2bd6
intel: Update mesa state in blit operations that want post-scissor draw bounds.
2008-12-19 13:04:29 -08:00
Eric Anholt
d091ebd4e4
intel: don't clip to scissor-clipped read framebuffer bounds in copypixels.
2008-12-19 13:04:23 -08:00
Eric Anholt
1e7785fe07
intel: Move copyteximage source clipping out of copytexsubimage.
...
glCopyTexSubImage already gets the (correct) clipping for us, so it doesn't
need the path. While moving the clipping out, replace the code with the mesa
path to do the same job.
2008-12-18 18:50:16 -08:00
Eric Anholt
d01c44aaca
mesa: Clip copytexsubimage to read framebuffer bounds, not scissor region.
2008-12-18 18:32:07 -08:00
Eric Anholt
aa09e0a1d5
mesa: Correct _mesa_clip_to_region() off-by-one.
...
Note how if:
x + width == xmax + 0: width -= 0
x + width == xmax + 1: width -= 0
x + width == xmax + 2: width -= 1
So, the function was clipping to [xmin, xmax+1), not [xmin, xmax) like it was
supposed to. Same for ymax.
2008-12-18 18:32:07 -08:00
Michal Krol
d9b92b112f
glsl: Fix handling of nested parens in macro actual arguments.
2008-12-18 11:11:59 -07:00
Brian Paul
f43019b226
demos: all glutDestroyWindow() upon exit to test query object clean-up
2008-12-18 11:11:59 -07:00
Xiang, Haihao
cb453244ca
i915: check WRAP_T instead of WRAP_R for cube map texture.
2008-12-18 12:59:43 +08:00
Xiang, Haihao
df73363ed1
i915: fix abort issue. (bug #19147 )
2008-12-18 10:07:45 +08:00
Brian Paul
35aebf4667
mesa: remove unneeded _mesa_reference_fragprog() call
...
The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
2008-12-17 18:05:03 -07:00
Jon Turney
8e7599892f
dri: fix for Cygwin compilation, bug 19144
2008-12-17 18:01:16 -07:00
Brian Paul
20555835b6
mesa: updated comments
2008-12-17 14:54:46 -07:00
Brian Paul
1cb680d06b
demos: add test of vertex-only and fragment-only shader programs
2008-12-17 13:58:31 -07:00
Brian Paul
637f06dcdc
util: check for frag/vertShader=0 before attaching
2008-12-17 13:58:05 -07:00
Brian Paul
3be8d6db9e
mesa: disable debug output
2008-12-16 15:25:58 -07:00
Brian Paul
368df1615e
mesa: fix some GLSL array regressions
...
array.length() wasn't working.
Swizzle mask for accessing elements of float arrays was incorrect.
2008-12-16 14:29:52 -07:00
Brian Paul
702b5b076b
mesa: rename slang_library_noise.[ch] to prog_noise.[ch] and rename functions
...
The noise functions were not glsl-specific.
Also, ran indent on the code to clean it up.
2008-12-15 18:37:39 -07:00
Brian Paul
c4341fe80a
mesa: updated GLSL docs
2008-12-15 18:30:40 -07:00
Brian Paul
ec8cdc7113
Merge branch 'glsl-1.20-v2'
2008-12-15 18:25:43 -07:00
Brian Paul
4561307a27
mesa: bump glsl grammar revision
...
And update some copyrights.
2008-12-15 18:24:16 -07:00
Brian Paul
63fc119d6c
mesa: in slang linker, replace assertion with link error when max samplers exceeded
2008-12-15 18:19:05 -07:00
Brian Paul
b8bfddf976
demos: updated tests/floattex.c (doesn't work just yet).
2008-12-15 18:19:05 -07:00
Brian Paul
c573b9f94a
mesa: move _mesa_dlopen(), etc into separate dlopen.c file
2008-12-15 18:19:05 -07:00
Brian Paul
12219210af
glut: added GLUT_PPM_FILE env var to dump first frame to a PPM file
...
Set GLUT_PPM_FILE to the desired filename. The first frame rendered will
be written to that file.
2008-12-15 18:19:05 -07:00
Brian Paul
49543d7177
mesa: more re-org of variable declarations in glsl compiler
2008-12-15 18:18:08 -07:00
Brian Paul
a1229cc9e7
mesa: more comments, clean up
2008-12-15 16:57:37 -07:00
Brian Paul
a66ff046cc
mesa: added comments, remove unused code
2008-12-15 16:49:32 -07:00
Brian Paul
aa1b904636
mesa: checkpoint: handle uniform vars in _slang_gen_var_decl()
...
This allows uniform declarations with scalar/array initializers.
The code is rough though, and will be cleaned up.
2008-12-15 16:44:55 -07:00
Eric Anholt
dc58da3e06
intel: stub out CompressedTexSubImage2D instead of segfaulting.
2008-12-15 15:10:18 -08:00
Eric Anholt
095c3a5cb1
i965: Update state before checking for fallbacks in brw_try_draw_prims.
...
This got flipped around in 7855b2aef6
.
Bug #18907 . Thanks to idr for pointing me at a nicer testcase than blender.
2008-12-15 13:34:07 -08:00
Pierre Willenbrock
e72a442153
intel: Don't steal renderbuffer from caller in intel_miptree_create_for_region
...
Fixes double-frees of some regions, once from the renderbuffer code and
once from the miptree itself.
Bug #19062
2008-12-14 19:27:56 -08:00
Eric Anholt
0dfec4ab61
i965: Add decode of index/vertex buffer and primitive emit.
2008-12-14 19:27:56 -08:00
Eric Anholt
bc3b8a39a7
intel: Add batchbuffer assertions to hopefully catch future mistakes.
2008-12-14 19:27:55 -08:00
Ian Romanick
1126aa86bf
Perform range checking on app supplied texture base level
...
It is possible for applications to specify any texture base level,
including trivially invalid values (i.e., 47000000). When an app
specifies an invalide base level, we should gracefully disable the
texture instead of accessing memory outside the gl_texture_object.
This fixes an occasional segfault in one of our conformance tests.
2008-12-14 18:46:18 -08:00
Ian Romanick
63cca2ba10
GLX: Include glapi.h before glapitable.h
...
A previous commit (2dbc515a66
) change
some of the interdependencies between these two header files. Now
glapi.h must be included before glapitable.h.
2008-12-14 18:46:17 -08:00
Ian Romanick
2dd0c16f21
GLX: Change resulting from previous commit
...
Commit db61cbfa2aa241da49589331d8b6875d9a77d826 made modifications to
the protocol generator data and scripts. This commit represents the
changes to the generated files resulting from the previous changes.
This is the client-side part of the fix for bugzilla #11003 .
2008-12-14 18:46:17 -08:00
Neil Roberts
1709ab01ef
Return 0 as the request size when the pixels parameter is NULL
...
img_null_flag was being ignored when calculating the size of a request
so a BadLength error gets thrown for glTexImage3D when the pixels
parameter is NULL.
See bug #11003
2008-12-14 18:46:17 -08:00
Ian Romanick
0f73302d24
GLX: Fix protocol for glTexSubImage#D
...
The TexSubImage commands do not have the "NULL image" flag that was
introduced with glTexImage3D. However, there is a CARD32 pad element
where that flag would be. Removing the img_null_flag causes the flag
to be removed from the protocol. This changes the protocol and breaks
everything.
In order to prevent needing to hand-code all of the TexSubImage
functions, a new attribute was added to the param element. This new
attribute, called "padding," is a boolean flag that selects whether or
not the parameter is a real parameter (default / false) or is protocol
padding (true) that does not appear in the function's parameter list.
This change resulted in a number of changes to other Python scripts.
In almost all cases parameters with the is_padding flag set should not
be emitted.
This patch only changes the the XML, the DTD, and the generator
scripts. It does NOT include the resulting changes to the generated
code. Generated code in the X server is also changed by the script /
XML changes in this patch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2008-12-14 18:46:17 -08:00
Dan Nicholson
8be02fc8c6
Add OSMesa pkg-config file
...
This makes the GLU .pc file a little simpler, too.
2008-12-14 09:35:29 -08:00
Dan Nicholson
71e208bafe
Add more package metadata to the pkg-config files
...
The pkg-config files have been filled in more thoroughly to allow users
to use mesa more effectively. By adding metadata to Requires.private,
Libs.private and Cflags, we can ensure that all the libraries and
headers will be found in all situations. However, the full substitutions
are only done when using the configure script.
This also fixes the glu pkg-config file to account for using GL or
OSMesa.
Fixes bug 18161.
2008-12-14 08:47:03 -08:00
Julien Cristau
85d882983f
Prepare changelog for upload
2008-12-14 09:59:33 +05:30
Gary Wong
a42342cd90
Fix silly type mismatch error in multinoise demo.
2008-12-13 20:06:21 -07:00
Gary Wong
d28e852895
i965: Finish OPCODE_NOISEn instructions.
...
Added missing OPCODE_NOISE4, and use BRW_REGISTER_TYPE_D (instead of _UD)
in the initial RNDD instructions (which avoids saturating negative inputs
to 0).
2008-12-13 14:28:28 -07:00
Gary Wong
d427a2910f
Add "multinoise" demo, to test 1/2/3/4 dimensional noise.
2008-12-13 14:28:04 -07:00
Gary Wong
0df3dfab82
Ensure p.w is initialised in noise demo.
2008-12-13 14:25:52 -07:00
Brian Paul
a9475cc240
mesa: use IFLOOR(x) instead of (int) FLOORF(x)
2008-12-12 18:03:48 -07:00
Brian Paul
3b61e9c6e6
mesa: place glsl constant arrays in constant memory
...
For example, a declaration like
const float[3] xxx = float[3](1.1, 2.2, 3.3);
will place the array in the constant buffer whereas a regular, non-const array
would be placed in the temporary register file.
Next up: do the same thing for uniform arrays.
2008-12-12 18:00:47 -07:00
Brian Paul
0da44c62cc
mesa: remove old size=4 limit
2008-12-12 18:00:19 -07:00
Brian Paul
d4be09fb2b
mesa: code clean-up in glsl compiler
2008-12-12 16:20:31 -07:00
Brian Paul
240e211c71
mesa: remove unneeded swizzle init code in glsl compiler
2008-12-12 16:02:31 -07:00
Brian Paul
4d49fc83f1
mesa: disable glsl debug output
2008-12-12 15:34:58 -07:00
Brian Paul
81253be334
mesa: remove unused varpool code in glsl compiler
2008-12-12 15:11:08 -07:00
Brian Paul
5c0c5e5af9
mesa: basic array constructors work now
...
For example: float[3] xxx = float[3](1.1, 2.2, 3.3);
Optimizations for const-qualified arrays next.
2008-12-12 15:07:21 -07:00
Brian Paul
c20d00f04b
mesa: copy array_len in slang_fully_specified_type_copy()
2008-12-12 15:01:00 -07:00
Brian Paul
9016331d0f
mesa: remove incorrect array_len assignment
2008-12-12 15:00:06 -07:00
Brian Paul
87a00959ba
mesa: array size fix in _slang_typeof_operation()
2008-12-12 13:18:30 -07:00
Brian Paul
8571401d7d
mesa: fix some more GLSL 1.20 array things.
...
Function that return arrays should work now.
2008-12-12 13:05:29 -07:00
Brian Paul
d5367622a3
mesa: more glsl function renaming
2008-12-12 10:32:56 -07:00
Brian Paul
b4019483de
mesa: use _slang_alloc()
2008-12-12 10:29:15 -07:00
Brian Paul
456a4e274f
mesa: glsl compiler function renaming
2008-12-12 10:22:47 -07:00
Brian Paul
9a174ef409
mesa: more glsl type/function movement
2008-12-12 10:17:58 -07:00
Brian Paul
aeeb9bca27
mesa: move some glsl compiler functions to different files to be more consistant
2008-12-12 10:11:41 -07:00
Brian Paul
ea9dc3879f
mesa: move _slang_locate_function() to different file
2008-12-12 10:03:31 -07:00
Brian Paul
19ca2908be
mesa: remove unused fixup table code in glsl compiler
2008-12-12 09:58:18 -07:00
Brian Paul
ade777ea1b
mesa: checkpoint: GLSL 1.20 array constructors
2008-12-12 09:56:13 -07:00
Brian Paul
1737f2dbdd
mesa: consolidate variable declaration initializer code for globals too
2008-12-11 19:34:43 -07:00
Brian Paul
2760bca1e1
mesa: move variable initializer IR generation into _slang_gen_var_decl()
...
More code consolidation coming...
2008-12-11 19:28:22 -07:00
Brian Paul
05ed9f7fe9
mesa: simplify some glsl variable declaration code
2008-12-11 19:10:58 -07:00
Xiang, Haihao
8b69c42b35
intel: check for null texture. ( fix #13902 )
2008-12-12 10:02:05 +08:00
Brian Paul
929eb00b32
mesa: glsl clean-ups
2008-12-11 18:49:28 -07:00
Brian Paul
2dc3de016c
mesa: checkpoint commit of GLSL 1.20 array syntax.
...
This allows things like float[3] x = float[3](1., 2., 3.);
Parsing and AST construction now. Codegen not working yet.
2008-12-11 18:02:19 -07:00
Xiang, Haihao
c8b505d826
i915: fallback for cube map texture.
...
The i915 (and related graphics cores) only support TEXCOORDMODE_CLAMP and
TEXCOORDMODE_CUBE when using cube map texture coordinates, so fall back to
software rendering for other modes to avoid potential gpu hang issue. This
fixes scorched3d issue on 945GM(see bug 14539).
2008-12-11 14:03:00 +08:00
Brian Paul
e8f5c1a5e8
mesa: in slang linker, replace assertion with link error when max samplers exceeded
2008-12-09 14:30:42 -07:00
Brian Paul
3c7419d57b
demos: updated tests/floattex.c (doesn't work just yet).
2008-12-09 14:29:14 -07:00
Brian Paul
c89690f765
mesa: move _mesa_dlopen(), etc into separate dlopen.c file
2008-12-09 14:26:02 -07:00
Guillaume Melquiond
3b9bc821e1
tnl: Fix zeroing of the 3ub part of a 3ub+1ub attrib pair in SSE.
...
Bug #16520 .
2008-12-09 13:18:02 -08:00
Guillaume Melquiond
b66495a0d9
tnl: Optimize SSE load[23]f_1 since they don't need the identity swizzle.
...
SSE movss from memory zeroes out everything above the destination dword, so
we get the (a, 0) or (a, 0, 0) result that these functions needed.
Bug #16520 .
2008-12-09 13:17:48 -08:00
Guillaume Melquiond
6e29a3c8e2
tnl: Fix typo that resulted in fallback from SSE for EMIT_3UB_3F_RGB/BGR.
...
Bug #16520
2008-12-09 11:42:24 -08:00
Guillaume Melquiond
d507cd749b
tnl: Avoid undefined input value use in insert_3f_viewport_2().
...
Bug #16520 .
2008-12-09 09:29:08 -08:00
Brian Paul
5295f9a033
glut: added GLUT_PPM_FILE env var to dump first frame to a PPM file
...
Set GLUT_PPM_FILE to the desired filename. The first frame rendered will
be written to that file.
2008-12-09 10:23:14 -07:00
Timo Aaltonen
5387880f18
delete progs/trivial/
2008-12-09 02:16:44 +02:00
Timo Aaltonen
a7a9398411
Build-depend on x11proto-dri2-dev (>= 1.99.3)
2008-12-09 02:01:40 +02:00
Timo Aaltonen
7593023f0b
Update the changelog for the snapshot
...
also drop 01_disable-intel-classic-warn.diff since it's obsolete now.
2008-12-09 01:57:44 +02:00
Timo Aaltonen
92d9a71f60
Merge commit 'origin/debian-experimental' into debian-experimental
...
Conflicts:
include/GLES/egltypes.h
progs/miniglx/glfbdevtest.c
progs/miniglx/manytex.c
progs/miniglx/sample_server.c
progs/miniglx/sample_server2.c
progs/miniglx/texline.c
progs/tests/Makefile.win
progs/tests/antialias.c
progs/tests/cva.c
progs/tests/dinoshade.c
progs/tests/getprocaddress.py
progs/tests/jkrahntest.c
progs/tests/manytex.c
progs/tests/multipal.c
progs/tests/multiwindow.c
progs/tests/sharedtex.c
progs/tests/texline.c
progs/tests/texrect.c
progs/tests/texwrap.c
progs/trivial/Makefile
2008-12-09 01:38:08 +02:00
Timo Aaltonen
661890211e
Merge commit 'mesa_7_2' into debian-experimental
2008-12-09 01:36:36 +02:00
Pierre Willenbrock
a0d5c3cfe6
intel: Require the right amount of space in glBitmap blit acceleration.
...
This leads to problems when the batchbuffer is flushed, but the bitmap
data could not fit into it.
2008-12-08 14:06:51 -08:00
Eric Anholt
f849d364c2
mesa: Fix GenerateMipmapEXT(GL_TEXTURE_CUBE_MAP_ARB).
...
The ctx->Driver.GenerateMipmap() hook only expects cubemap face enums, not
CUBE_MAP_ARB, so walk all faces when we encounter that. Fixes oglconform
fbo.c segfault with both swrast and i965 drivers.
2008-12-06 22:41:52 -08:00
Eric Anholt
8b661a5d33
intel: Fall back on rendering to a texture attachment with a border.
...
Fixes a segfault in oglconform fbo.c test.
2008-12-06 22:41:52 -08:00
Eric Anholt
75b26e18a6
intel: Fix crash in automatic mipmap generation for glCopyTex{Sub,}Image.
...
The images aren't mapped at this point, so we want the generic Mesa path for
GenerateMipmapEXT that does the mapping/unmapping for us. Ideally Mesa would
just call it for us.
2008-12-06 22:41:52 -08:00
Eric Anholt
a0625fa281
intel: Fix glCopyPixels blit acceleration for FBO destinations.
...
This was another opportunity to either get clipped to screen size or not get
clipped enough and draw outside of object boundaries.
2008-12-06 22:41:51 -08:00
Eric Anholt
cb433d91c6
intel: Fix glBitmap blit acceleration for FBO destinations.
...
Bug #18914 . Fixes fbo_firecube hang due to drawing outside the FBO bounds.
Thanks to Pierre Willenbrock for debugging the issue.
2008-12-06 22:41:51 -08:00
Eric Anholt
bdc8ac4426
intel: Put CopyTexImage fallback under DEBUG_FALLBACKS not DEBUG_TEXTURE.
2008-12-06 22:41:51 -08:00
Brian
6e0f8b174d
mesa: assorted clean-ups, updated comments, etc.
2008-12-05 09:20:06 -07:00
Brian
249e1e4d30
mesa: replace large macros with inline functions
2008-12-05 09:20:06 -07:00
Brian
39091cc638
demos: added simple vertex shader texture test.
...
Draw a quadmesh where Z coord is taken from a texture map.
2008-12-03 18:55:25 -07:00
Jeremy Huddleston
f18880038b
darwin: Use -Os instead of -O2
...
(cherry picked from commit 456dbb143a0d11b69d8af0d493cd84efb0596273)
2008-12-03 17:03:35 -08:00
Eric Anholt
264cba6f70
i965: Fix failure to upload new constant data when changing programs.
...
This is fallout from the ffvertex_prog.c work. It doesn't call
ProgramStringNotify, so we don't set param_state, so we wouldn't track when
VP parameters changed, and constants wouldn't get uploaded. Instead, remove
param_state entirely and just use the real value that we want to be tracking.
Fixes rendering in openarena since BRW_NEW_BATCH got disentangled from
BRW_NEW_INDICES.
Bug #18822 .
2008-12-03 11:45:16 -08:00
Eric Anholt
8a1e7086c7
i965: Fix stray character that the compile whined about.
2008-12-03 11:30:58 -08:00
Kristian Høgsberg
154a9e5317
Bump dri2proto requirement to 1.99.3, drop CopyRegion bitmask from protocol.
2008-12-01 21:44:03 -05:00
Dave Airlie
cd031749a7
intel: restore old vertex submit paths for i8xx hardware.
...
Intel docs state that only 830/845 have VBOs, 855/865 don't. So
lets just not use them on i8xx at all.
This restores the old pre-vbo code and uses it on all 8xx hw.
2008-12-02 20:31:14 +10:00
Brian
1e2f574251
mesa: fix conditional in save_Lightfv(), bug 18838
2008-12-01 18:32:47 -07:00
Eric Anholt
e476acb105
i965: Add a new state flag BRW_NEW_NR_SURFACES instead of CACHE_NEW_SURFACE
...
The CACHE_NEW_SURFACE bit always gets spammed since we get many different
surface BOs per state emit, but the only consumer of it wanted to just know
how many surfaces were enabled.
2008-11-28 17:09:46 -08:00
Eric Anholt
8e5639577c
i965: Fix clashing enums for BRW_NEW_INDICES/VERTICES versus BATCH/DEPTH_BUFFER.
...
Fixes upload of large amounts of state for every new primitive emit.
2008-11-28 17:09:46 -08:00
Eric Anholt
287d719a93
i965: Remove BRW_WM_LOCK dirty bit, introduced to work around lack of relocs.
...
This was causing a prepare of wm state at every primitive emit.
2008-11-28 17:09:46 -08:00
Eric Anholt
3f973de07c
i965: Add debug code for dumping how frequently different dirty bits are set.
2008-11-28 17:09:46 -08:00
Eric Anholt
8e76ac070d
i915: Remove dead early z enable bit which was always on.
2008-11-28 17:09:46 -08:00
Eric Anholt
7855b2aef6
i965: Reduce fast-pathiness of brw_try_draw_prims, bringing in important checks.
...
Later primitives, even if they caused a full state validate, wouldn't check
that there was enough space in the batchbuffer, occasionally triggering the
sanity check. We also skipped the aperture space check, even if it would
mean bringing in new programs and associated state.
2008-11-28 17:09:45 -08:00
Brian Paul
baaf9779f1
mesa: add missing break statements
2008-11-28 16:17:57 -07:00
Brian Paul
166d5ac170
mesa: enable texture compression extensions for software drivers when possible
2008-11-28 14:08:04 -07:00
Phillip Klaus Krause
3b5cd7d74a
mesa: remove unneeded compressed texure size checks
2008-11-28 13:54:08 -07:00
Brian Paul
ec17001cd4
mesa: fix default switch case in append_token(), see bug 18734
2008-11-28 13:50:41 -07:00
Brian Paul
c303e7299b
mesa: remove an assertion (see bug 18734)
2008-11-27 11:01:30 -07:00
RALOVICH, Kristóf
8c2b4b33c5
Revert "glx: xcbified visual and FBConfig choosing"
...
This reverts commit 62688f1135
.
2008-11-27 07:20:38 -07:00
RALOVICH, Kristóf
80d1531ebe
Revert "glx: revert using nonexsisten XCB version of glXGetFBConfigsSGIX"
...
This reverts commit 5369876501
.
2008-11-27 07:20:35 -07:00
RALOVICH, Kristóf
5369876501
glx: revert using nonexsisten XCB version of glXGetFBConfigsSGIX
...
This uses a GLX VendorPrivate request. VendorPrivates are real GLX API
calls but use the same protocol request. XCB does not currently
support specific VendorPrivetes directly. See eg.:
http://lists.freedesktop.org/archives/xcb/2008-November/004036.html
for more information.
2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
1e167f6b5c
glx: remove XCB debug leftover
2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
ff3fa92eaa
glx: xcbified glXSwapBuffers
2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
62688f1135
glx: xcbified visual and FBConfig choosing
2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
66db1b64e8
glx: xcbified __glXClientInfo
2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
5f19f5c586
configure.ac: advertise XCB
2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
6d1d157606
glx: no graphics context during initialization
2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
9c7aaa7afb
glx: xcbified __glXIsDirect
2008-11-26 10:02:10 -07:00
RALOVICH, Kristóf
00f22f972f
glx: missing static on local function
2008-11-26 10:02:10 -07:00
RALOVICH, Kristóf
f0d015cccb
glx: use __glXGetString
2008-11-26 10:00:58 -07:00
RALOVICH, Kristóf
9c98e35ff6
glx: use __glXQueryServerString
2008-11-26 10:00:58 -07:00
RALOVICH, Kristóf
24b8a8cfe8
glx: implement __glXGetString, hide __glXGetStringFromServer
2008-11-26 10:00:58 -07:00
RALOVICH, Kristóf
fd52001c5c
glx: implement QueryVersion using XCB
2008-11-26 10:00:58 -07:00
RALOVICH, Kristóf
5444424562
glx: implement __glXQueryServerString using XCB
2008-11-26 10:00:58 -07:00
Thomas Henn
55aeeef547
windows: fix visual object memleak
2008-11-26 09:51:29 -07:00
Thomas Henn
279343059f
windows: fix _mesa_unreference_framebuffer() to pass ** type.
2008-11-26 09:49:32 -07:00
Brian Paul
001b1cbb0d
mesa: add missing type check for function calls
2008-11-26 09:35:26 -07:00
Brian Paul
aa40de5c6f
mesa: add missing size check for assignment optimization
2008-11-26 09:35:08 -07:00
Brian Paul
fea3a32e17
mesa: remove debug code
2008-11-26 09:02:37 -07:00
Brian Paul
e23122d309
demos: press SPACE to toggle fbo_firecube animation
2008-11-26 09:00:44 -07:00
Brian Paul
11701b4c15
mesa: add some missing switch cases for generating state var strings
2008-11-26 07:21:12 -07:00
Daniel Zimmermann
c03af8e780
fix possible memory leak in bezierPatchMeshMake
2008-11-26 07:20:02 -07:00
Brian Paul
8d95e66cf7
mesa: added support for GLSL 1.20 array.length() method
...
This is the only method supported in GLSL 1.20 so we take a few short-cuts.
2008-11-24 17:18:56 -07:00
Brian Paul
0fab514ff5
mesa: support for GLSL 1.20 array types
...
This allows syntax like "float[8] foo, bar;"
2008-11-24 15:28:21 -07:00
Brian Paul
b730d0d3e9
mesa: add gl_program::Input/OutputFlags[] array
...
These arrays will indicate per-input or per-output options for vertex/fragment
programs such as centroid-sampling and invariance.
2008-11-24 13:05:54 -07:00
Bernd Buschinski
d52e8543b6
glx: Add missing include for XCB, fixing crash on 64-bit.
...
Bug #18689
2008-11-24 11:40:38 -08:00
Brian Paul
153cc70ddb
windows: replace free() with _mesa_unreference_framebuffer()
...
Fixes invalid memory reference bug when exiting.
2008-11-24 11:10:58 -07:00
Brian Paul
a203713738
mesa: copy centroid/invariance/precision info in parse_init_declarator()
2008-11-24 09:28:25 -07:00
Brian Paul
dc1107c08d
mesa: check that varying variable qualifiers agree
2008-11-24 09:25:05 -07:00
Brian Paul
0e2f757413
mesa: copy precision/variant/centroid info in slang_fully_specified_type_copy()
2008-11-24 09:13:14 -07:00
Brian Paul
3197954554
mesa: set flags for varying vars
2008-11-24 09:05:49 -07:00
Brian Paul
f490ec9797
mesa: rename program parameter flags to match other Mesa conventions
2008-11-24 09:04:52 -07:00
Brian Paul
08b825a771
mesa: copy Flags in _mesa_clone_parameter_list()
2008-11-24 09:04:11 -07:00
Brian Paul
3f6668a4bf
mesa: dump/debug varying vars list
2008-11-24 09:03:47 -07:00
Brian Paul
777a5c4f2e
mesa: added PROG_PARAM_ bits for invariant, flat/linear interpolation
...
Plus, update the print/debug code.
2008-11-24 08:43:38 -07:00
Brian Paul
0f228d7ab3
mesa: add Flags field to gl_program_parameter
...
Only one flag defined so far: PROG_PARAM_CENTROID_BIT
2008-11-24 08:33:49 -07:00
Brian Paul
5464667874
docs: update webmaster email addr
2008-11-24 08:14:28 -07:00
Brian Paul
4f05893415
mesa: issue error, don't crash, when calling a prototyped, but undefined function
...
Bug #18659 .
2008-11-21 17:22:16 -07:00
Brian Paul
b63a31b36f
mesa: better variable name: s/aux/store/
2008-11-21 14:24:28 -07:00
Brian Paul
c45c5c4ca4
added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader
...
Fragment's red/greenb/blue is a function gl_FragCoord.xyz
2008-11-21 10:04:37 -07:00
Eric Anholt
3e0164aabb
i965: Add support for accelerated CopyTexSubImage.
...
There were hacks in EmitCopyBlit before to adjust offsets so that y=0 after
the offsets had been adjusted for a negative pitch. It appears that those
hacks were due to an unclear and surprising aspect of the hardware: inverting
the pitch results in the blit into the specified rectangle being inverted,
without the user needing to adjust y and base offset.
Tested with piglit copytexsubimage test on 915GM and GM965. Should fix
serious performance issues with ETQW and other applications.
2008-11-21 17:35:33 +08:00
Eric Anholt
a6aa926e3f
intel: Don't glBitmap fallback with scissoring enabled.
...
The blit bitmap code already handles scissoring. This is a 15-100% speedup on
blender benchmark.blend thanks to avoiding fallbacks. Bug #17951 .
2008-11-21 13:25:10 +08:00
Eric Anholt
2adef553f2
i915: Don't overwrite i915's Viewport function from generic code.
...
Instead, have i965 and i915 both call the generic function from their Viewport.
2008-11-21 13:23:46 +08:00
Xiang, Haihao
b6bb5e09e0
mesa: fix shadow sampling unit issue.
...
texture comparison logic is bypassed if the currently bound texture is not
a depth/depth_stencil texture.
2008-11-20 16:54:16 +08:00
airlied
1412ca0be2
intel: fix i830 comment + backwards VB offsets.
...
According to Keith the docs have these offsets the other way around
2008-11-20 21:27:45 +10:00
airlied
1ea414fdeb
intel: fix i8xx vbo enable bit
2008-11-20 21:14:45 +10:00
airlied
b17e343bdd
intel: add lots of i830 engine to intel_decode debug
2008-11-20 18:18:20 +10:00
Brian Paul
bab4e78734
mesa: minor comment reformattting
2008-11-19 16:04:37 -07:00
Brian Paul
bf7f9d2143
mesa: glsl compiler debug code
...
RETURN0 macro reports file/line before returning zero.
2008-11-19 15:08:46 -07:00
Brian Paul
ae0ff8097b
mesa: rework GLSL array code generation
...
We now express arrays in terms of indirect addressing. For example:
dst = a[i];
becomes:
MOV dst, TEMP[1 + TEMP[2].y];
At instruction-emit time indirect addressing is converted into ARL/
ADDR-relative form:
ARL ADDR.x, TEMP[2].y;
MOV dst, TEMP[1 + ADDR.x];
This fixes a number of array-related issues. Arrays of arrays and complex
array/struct nesting works now.
There may be some regressions, but more work is coming.
2008-11-19 14:12:25 -07:00
Brian Paul
e709d68d92
mesa: don't realloc instruction buffer so often
2008-11-19 09:12:47 -07:00
Brian Paul
d9fa9e3290
mesa: updated comment
2008-11-19 09:12:47 -07:00
Xiang, Haihao
2f9ceb158a
mesa: clamp luminance if needed.
...
This fixes glReadPixels(GL_LUMINANCE, GL_FLOAT)/glGetTexImage(GL_LUMINANCE, GL_FLOAT) issue
on fixed-point color buffers.
2008-11-19 11:30:30 +08:00
Brian Paul
80d6379722
mesa: no longer need Writemask field in GLSL IR nodes
...
The Swizzle and Size fields carry all the info we need now.
2008-11-13 18:19:12 -07:00
Brian Paul
3a7ed9779b
mesa: revamp GLSL instruction emit code
...
This is a step toward better array handling code. In particular, when more
than one operand of an instruction uses indirect addressing, we'll need some
temporary instructions and registers. By converting IR storage to instruction
operands all in one place (emit_instruction()) we can be smarter about this.
Also, somewhat better handling of dst register swizzle/writemask handling.
This results in tighter writemasks on some instructions which is good for
SOA execution.
And, cleaner instruction commenting with inst_comment().
Next: remove some more dead code and additional clean-ups...
2008-11-13 18:19:12 -07:00
Brian Paul
610c2461ce
mesa: make writemask_string() non-static
2008-11-13 18:19:12 -07:00
Brian Paul
4c167f8fc1
mesa: remove some do-nothing GLSL code
2008-11-13 18:19:12 -07:00
Brian Paul
fe984aed5a
mesa: fix accidental regression in GLSL built-in texture matrix lookup
...
Was broken by commit 9aca9a4b72b2a7b378e50bd88f9c3324d07375ec.
2008-11-13 18:19:12 -07:00
Brian Paul
d835f415c6
mesa: use the tighter definition of GLSL ftransform() from the gallium branches
2008-11-13 18:19:12 -07:00
Brian Paul
e556cc82f8
mesa: remove unused/obsolete __NormalMatrixTranspose matrix
2008-11-13 18:19:12 -07:00
Brian Paul
47b883e42b
mesa: fix bug in GLSL built-in matrix state lookup
2008-11-13 18:19:12 -07:00
Brian Paul
557fde9531
mesa: tweak program register printing for RelAddr case
2008-11-13 18:19:12 -07:00
Alan Hourihane
e4c9aeed8b
mesa: fix generation of fixed function state when no vp exists
2008-11-13 13:31:10 +00:00
Eric Anholt
c30eb2c104
i965: Upload state on primitive switch, don't just prepare it.
...
This was a regression in 59b2c2adbb
that broke
blender, among other apps.
2008-11-12 13:37:16 -08:00
Eric Anholt
2fc9d671e0
i965: Fix VB refcount leak on aperture overflow.
2008-11-12 13:34:20 -08:00
Eric Anholt
72bbc89534
Add glsync demo program from jbarnes for testing vblank synchronization.
2008-11-12 13:07:23 -08:00
Eric Anholt
62ff7ab720
i965: Fix up VS max_threads for G4X and removing a magic number.
...
As far as I can read in the docs, VS threads can be 1:1 with the pairs of
VUE handles allocated for them. Also, G4X can run twice as many threads as
before (though we won't unless the we bump the preferred URB entries for VS).
2008-11-12 13:07:23 -08:00
Eric Anholt
9dadfc09a9
i965: Fix up SF max_threads.
...
We were dividing the number of URB entries by two to get number of threads,
which looks suspiciously like a copy'n'paste-o from brw_vs_state.c. Also, the
maximum number of threads is 24, not 12.
2008-11-12 13:07:23 -08:00
Eric Anholt
82eb7c235d
i965: Fix up clip min_nr_entries, preferred_nr_entries, and max_threads.
...
The clip thread could potentially deadlock when processing tristrips since
being moved back to dual-thread mode, as the two threads could each have 4 VUEs
referenced and not be able to allocate another one since SF processing
wasn't able to continue (needing 5 entries before it freed 2).
In constrained URB mode, similar deadlock could even have occurred with
polygons (so we cut back max_threads if we can't handle it any primitive type).
2008-11-12 13:07:22 -08:00
Eric Anholt
5cb7ba10cc
i965: Update WM maximum threads for G4X.
2008-11-12 13:07:22 -08:00
Eric Anholt
d70d62c561
i965: Add a big comment explaining my understanding of URB management.
...
It shouldn't offer anything new over what's in the docs (except for G4X notes),
but here it's all in one place.
2008-11-12 13:07:22 -08:00
Kristian Høgsberg
e1fbb30211
glFlush before CopySubBuffer, fix coordinates and extension name typo.
2008-11-12 15:26:25 -05:00
Hanno Böck
becf3d9272
glx: fix xcb build
2008-11-12 06:56:42 -07:00
Brian Paul
90246d3ea5
mesa: fix version check in dinoshade.c
2008-11-11 14:35:39 -07:00
Brian Paul
f4361540f8
mesa: allow relative indexing into all register files and indirect dst register indexing
2008-11-11 14:35:39 -07:00
Kristian Høgsberg
57d78067bd
Don't mess with emacs tab width.
2008-11-11 13:41:43 -05:00
Xiang, Haihao
09623fe551
intel: reset cliprect_mode to IGNORE_CLIPRECTS.
...
This ensures all batchbuffers have a same cliprect mode after calling
_intel_batchbuffer_flush even if there aren't invalid commands in the
current batch buffer. (fix bug#18362).
2008-11-11 13:58:15 +08:00
Xiang, Haihao
8412b06b67
mesa: restore the negate flag of dots in build_lighting.
...
Dots is re-used if more than one light is enabled. Previously
the negate flag of dots may affect next light.
2008-11-11 13:36:32 +08:00
Xiang, Haihao
064b04d464
mesa: update new state for RasterPos like other operations.
...
This fixes a lighting issue when drawing a bitmap.
2008-11-11 13:35:51 +08:00
Brian
be1b8e5d6c
mesa: new _mesa_is_pow_two() function
2008-11-10 20:16:00 -07:00
Brian Paul
8df4f6667f
mesa: restore glapi/ prefix on #include
2008-11-10 16:38:47 -07:00
Brian Paul
59cc973940
mesa: fix some misc breakage caused by editing auto-generated files rather than the python generators
...
Specifically:
#include "glapitable.h" in src/mesa/main/glapi/dispatch.h
Call _mesa_bsearch() in src/mesa/main/enums.c.
2008-11-10 14:42:02 -07:00
Brian Paul
13f96c5401
GLX: fix out-of-bounds memory issue in indirect glAreTexturesResident()
...
See bug 18445.
When getting array results, __glXReadReply() always reads a multiple of
four bytes. This can cause writing to invalid memory when 'n' is not a
multiple of four.
Special-case the glAreTexturesResident() functions now.
To fix the bug, we use a temporary buffer that's a multiple of four bytes
in length.
NOTE: this commit also reverts part of commit 919ec22ecf
(glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protection) which
directly edited the indirect.c file rather than the python generator!
I'm not repairing that issue at this time.
2008-11-10 14:27:42 -07:00
Brian Paul
6186e7a206
dri: alloc __DRIscreen object with calloc()
2008-11-10 12:39:36 -07:00
Brian Paul
2d76a0d77a
mesa: track initialization status of uniform variables. Plus, asst clean-ups.
2008-11-10 12:39:36 -07:00
Brian Paul
379ff8c956
mesa: initial support for uniform variable initializers.
...
This lets one specify initial values for uniforms in the code, avoiding
the need to call glUniform() in some cases.
2008-11-10 12:39:36 -07:00
Brian Paul
242c0cb543
mesa: fix logic error in GLSL linker when looking for main() shaders
2008-11-10 12:39:36 -07:00
Brian Paul
80c8017a64
mesa: allows 'f' suffix on GLSL float literals
2008-11-10 12:39:36 -07:00
Brian Paul
e5359401d6
undo accidental changes to multitex.frag shader
2008-11-10 12:39:36 -07:00
Brian
f1c9016af1
mesa: remove OPCODE_INT #define
2008-11-08 10:33:30 -07:00
Brian
e24afc808f
mesa: use NRM3 in emit_normalize_vec3() when drivers are ready
2008-11-08 10:29:03 -07:00
Brian Paul
87d1a26ba3
mesa: add support for 'centroid' qualifier in GLSL 1.20
2008-11-07 16:08:21 -07:00
Brian Paul
448156f769
mesa: add support for 'invariant' keyword for GLSL 1.20
2008-11-07 15:51:10 -07:00
Brian Paul
b632e5aa7f
mesa: reformat comments, rewrap lines, etc for a little better readability
2008-11-07 14:28:00 -07:00
Brian Paul
22459e7a9c
mesa: forgot sqrt in NRM3/4 instructions
2008-11-07 12:59:36 -07:00
Brian Paul
6dc91b8371
mesa: fix opcode table order bug
2008-11-07 12:59:08 -07:00
Brian Paul
a98a25c25f
mesa: add GLSL support for DP2, NRM3, NRM4 instructions (not actually emitted yet though)
2008-11-07 09:51:25 -07:00
Brian Paul
65cb74ecc0
mesa: added DP2, DP2A instructions
2008-11-07 09:51:25 -07:00
Brian Paul
37eef7b474
mesa: added AND/OR/NOT/XOR instructions
2008-11-07 09:51:25 -07:00
Brian Paul
d93072782a
mesa: include shader/prog_instruction.h
...
Seems to fix a mysteriously missing build dependency.
2008-11-07 09:51:25 -07:00
Brian Paul
f6ead50827
mesa: added OPCODE_NRM3/NRM4 instructions for vector normalization.
...
We may emit these instructions from GLSL instead of DP3/RCP/MUL.
Also, implement SSG (set sign) instruction in the interpreter.
2008-11-07 09:51:25 -07:00
Xiang, Haihao
4550b0562d
mesa: use _bfc0 instead of _col0 when building back face lighting.
2008-11-07 14:58:04 +08:00
Brian Paul
035c0cf71a
mesa: rename OPCODE_INT -> OPCODE_TRUNC
...
Trunc is a more accurate description; there's no type conversion involved.
2008-11-06 17:14:33 -07:00
Brian Paul
517401af07
mesa: update the shader programs->TexturesUsed array at link time
...
If an application never calls glUniform() to set sampler variable values
they'll remain 0 (the default value/unit).
Now call _mesa_update_shader_textures_used() at link time in case glUniform()
is never called. program->TextureUsed[] will then be correct for state
validation.
2008-11-06 15:24:18 -07:00
Xiang, Haihao
df94fd1764
i965: Always check vertex program.
...
Now i965 also uses the vertex program created by Mesa Core, but this vertex program
is not only depend on mesa state _NEW_PROGRAM, so always check the current vertex
program is updated or not. This fixes broken demo cubemap.
2008-11-06 15:25:55 +08:00
Gary Wong
0060d41549
i965: Implement missing OPCODE_NOISE3 instruction in fragment shaders.
...
OPCODE_NOISE4 coming later.
2008-11-05 20:38:05 -05:00
Brian Paul
1bfdab781b
mesa: Fix compiler warnings on Windows.
...
cherry-picked subset of a77976d2ee
2008-11-05 16:04:40 -07:00
Brian Paul
50beb4e6fd
mesa: fix a GLSL array indexing codegen bug
...
Expressions like array[i] + array[j] didn't work properly before.
2008-11-05 16:02:16 -07:00
Brian Paul
dea4826b84
mesa: remove extra \n from printf string
2008-11-05 09:34:15 -07:00
Brian Paul
949e7383b5
mesa: add Initialized field to gl_uniform struct, for debugging purposes only
2008-11-05 09:17:55 -07:00
Brian Paul
aab429c8df
added glsl/skinning.c test to test matrix blending/weighting
2008-11-04 16:56:59 -07:00
Brian Paul
6c8274078d
mesa: fix float-valued GLSL vertex attribute variables
...
The swizzle mask for such variables wasn't set up properly.
2008-11-04 16:55:18 -07:00
Brian Paul
35a9f1bccf
print err msg if unable to open shader file
2008-11-04 16:55:18 -07:00
Brian Paul
d3222cb1d4
remove old debug glFlush/Finish calls from demos
2008-11-04 16:55:18 -07:00
Eric Anholt
4be624d693
i965: Clean up stale NDC comment.
2008-11-02 12:30:01 -08:00
Eric Anholt
9fd4c27ae3
i965: Avoid vs header computation for negative rhw on G4X.
...
This cuts one MOV out when setting a zero header.
2008-11-02 12:30:01 -08:00
Eric Anholt
34b1776e8d
i965: Merge GM45 into the G4X chipset define.
...
The mobile and desktop chipsets are the same, and having them separate is
more typing and more chances to screw up.
2008-11-02 12:30:00 -08:00
Eric Anholt
d758c48761
i965: Fix copy'n'paste issue that made brw->urb.constrained useless.
...
Also, add a comment explaining what brw->urb.constrained tries to do.
2008-11-02 12:30:00 -08:00
Brian Paul
bbffed0857
mesa: silence warnings
2008-11-01 16:05:40 -06:00
Brian Paul
b625a0a475
mesa: do scope replacement for while/for loops too
...
This fixes a function inlining bug involving vars declared inside loop bodies.
2008-11-01 16:05:40 -06:00
Brian Paul
3d0d803313
mesa: glsl tree print improvements
2008-11-01 16:05:40 -06:00
Brian Paul
1e1ba54a94
mesa: fix assignment / parameter passing of sampler types
2008-11-01 16:05:40 -06:00
Brian Paul
131d42573c
mesa: additional debug flags for glsl debug/disassembly
2008-11-01 16:05:40 -06:00
Keith Packard
72c914805b
Fix for 58dc8b7
: dest regions must not use HorzStride 0 in ExecSize 1
...
Quoting section 11.3.10, paragraph 10.2 of the 965PRM:
10.2. If ExecSize is 1, dst.HorzStride must not be 0. Note that this is
relaxed from rule 10.1.2. Also note that this rule for destination
horizontal stride is different from that for source as stated in
rule #7 .
GM45 gets very angry when rule 10.2 is violated.
Patch 58dc8b7
(i965: support destination horiz strides in align1 access mode)
added support for additional horizontal strides in the ExecSize 1 case, but
failed to notice that mesa occasionally re-purposes a register as a
temporary destination, even though it was constructed as a repeating source
with HorzStride = 0.
While, ideally, we should probably fix the code using these register
specifications, this patch simply rewrites them to use HorzStride 1 as the
pre-58dc8b7 code did.
Signed-off-by: Keith Packard <keithp@keithp.com >
2008-11-01 14:38:19 -07:00
Brian Paul
06fe728e5b
mesa: fix some bugs with precision qualifier parsing
2008-10-31 17:42:26 -06:00
Brian Paul
90711775d7
mesa: do scope replacement for variable initializers too
2008-10-31 17:42:26 -06:00
Brian Paul
89bca902b3
mesa: fix copy/paste error in GLSL error msg
2008-10-31 17:42:25 -06:00
Eric Anholt
69e10084cd
intel: pixelzoom doesn't apply to glBitmap, so disable the fallback.
2008-10-31 16:04:50 -07:00
Eric Anholt
018088996a
intel: Remove fallback for glDrawPixels(GL_COLOR_INDEX)
...
GL_COLOR_INDEX mode is just like other normal formats (that is, not
depth/stencil) and is uploaded fine by TexImage.
2008-10-31 16:04:50 -07:00
Eric Anholt
ed478a5fde
intel: Add more fallback debugging for glDrawPixels.
2008-10-31 16:04:50 -07:00
Gary Wong
ab3e9c481f
i965: implement the missing OPCODE_NOISE1 and OPCODE_NOISE2 instructions.
...
(Only in fragment shaders, so far. Support for NOISE3 and NOISE4 to come.)
2008-10-31 17:37:26 -04:00
Gary Wong
58dc8b7db5
i965: support destination horiz strides in align1 access mode.
...
This is required for scatter writes in destination regions to work.
2008-10-31 17:34:32 -04:00
Xiang, Haihao
963071ffea
mesa: fix a typo in the previous commit
2008-10-31 09:24:27 +08:00
Xiang, Haihao
bccc09e6bf
mesa: fix an issue in _mesa_PointParameterfv().
2008-10-30 10:40:51 +08:00
Brian Paul
239ce2240a
glx: added PFNGL*PROC typedefs for GLX 1.3 functions
...
Since we define GLX_VERSION_1_3 in glx.h, the typedefs in the glxext.h header
were getting skipped.
2008-10-29 15:49:19 -06:00
Nigel Stewart
cd1283f515
glu: fix compilation problem when using Windows gl.h (sf bug 2204589)
2008-10-29 09:23:48 -06:00
Eric Anholt
26c1c04fd0
intel: Fix glDrawPixels with 4d RasterPos.
2008-10-28 22:52:38 -07:00
Eric Anholt
59b2c2adbb
i965: Fix check_aperture calls to cover everything needed for the prim at once.
...
Previously, since my check_aperture API change, we would check each piece of
state against the batchbuffer individually, but not all the state against the
batchbuffer at once. In addition to not being terribly useful in assuring
success, it probably also increased CPU load by calling check_aperture many
times per primitive.
2008-10-28 22:52:38 -07:00
Brian Paul
835a9fef05
mesa: include glslcompiler driver in tarball
2008-10-28 18:27:21 -06:00
Brian Paul
1100866aa1
mesa: fix stand-alone glslcompiler build
2008-10-28 17:03:49 -06:00
Eric Anholt
0cade4de4f
intel: Don't keep intel->pClipRects, and instead just calculate it when needed.
...
This avoids issues with dereferencing stale cliprects around intel_draw_buffer
time. Additionally, take advantage of cliprects staying constant for FBOs and
DRI2, and emit cliprects in the batchbuffer instead of having to flush batch
each time they change.
2008-10-28 13:23:33 -07:00
Gary Wong
e92a457ac0
i965: Allocate temporaries contiguously with other regs in fragment shaders.
...
This is required for threads to be spawned with correctly sized GRF
register blocks.
2008-10-28 15:03:14 -04:00
Julien Cristau
98fcdf3f49
configure.ac: Add support for gnu/kfreebsd
...
Check for *-gnu instead of linux* to set DEFINES.
Change some freebsd* checks to *freebsd*.
2008-10-28 11:45:05 -07:00
Eric Anholt
bcfba0d91e
i965: Fix compiler warning from unused var.
2008-10-27 11:53:06 -07:00
Eric Anholt
a74b1e149d
i965: Remove dead brw->wrap flag.
2008-10-27 11:53:06 -07:00
Eric Anholt
dd17cd600a
intel: Use dri_bo_get_tiling to get tiling mode of buffers we get from names.
...
Previously, we were trying to pass a name to the GEM GET_TILING_IOCTL,
which needs a handle, and failing. None of our buffers were tiled yet, but
they will be at some point with DRI2 and UXA.
2008-10-27 11:53:06 -07:00
Julien Cristau
0206e20240
Also build the x86-specific dri drivers on kfreebsd ( closes : #492894 ).
2008-10-26 15:58:46 +01:00
Julien Cristau
83a4719056
Update changelog
2008-10-26 15:34:37 +01:00
Ian Romanick
6cfe871c75
Use 3Dnow! x86-64 routines only on processors that support 3Dnow!
...
Added an x86-64 CPUID function and use it to detect 3Dnow! If 3Dnow!
is available, use _mesa_3dnow_transform_points4_3d_no_rot,
_mesa_3dnow_transform_points4_perspective,
_mesa_3dnow_transform_points4_2d_no_rot, and _mesa_3dnow_transform_points4_2d.
This fixes long standing bug #8724 .
(cherry picked from commit 2b8d8989fb
)
2008-10-26 15:23:27 +01:00
Xiang, Haihao
2a877411db
intel: GL_FALSE on a BO if it won't be modified when mapping this BO. (thanks Eric).
2008-10-26 06:38:27 +08:00
Xiang, Haihao
ec8076264e
i965: don't emit state when dri_bufmgr_check_aperture_space fails.
...
This ensures there is an unfilled batchbuffer used for emitting states again. Partial fix for #17964 .
2008-10-24 16:05:48 +08:00
Xiang, Haihao
f657c81911
intel: fallback for intelEmitCopyBlit.
...
Use _mesa_copy_rect instead of BLT operation if dri_bufmgr_check_aperture_space
still fails after flushing batchbuffer. Partial fix for #17964 .
2008-10-24 15:55:32 +08:00
Brian Paul
8c20c913f8
mesa: version 43 of glext.h
2008-10-23 11:23:36 -06:00
Brian Paul
3efd3b1512
mesa: version 21 of glxext.h
2008-10-23 11:21:32 -06:00
Brian Paul
ea6ddcbe0e
mesa: remove calls to _mesa_adjust_image_for_convolution(), use texImage fields
...
The texImage->Width/Height fields will have the post-convolution width/height.
2008-10-23 10:49:51 -06:00
Brian Paul
95c04cccfe
mesa: move convolution image adjustment code for glCopyTexSubImage1/2/3D()
...
Do it after initial error checking, after we know the texture's internal format.
2008-10-22 07:53:26 -06:00
Brian Paul
9dfd54fa83
mesa: some re-org of glCopyTexSubImage1/2/3D() error checking
2008-10-22 07:48:37 -06:00
Brian Paul
22e442544b
mesa: in textore.c, only adjust image for convolution if image is a color format
...
Makes things consistant with the code in teximage.c.
We only want to apply convolution to color formats (not depth/index formats)
2008-10-22 07:36:33 -06:00
Kristof Ralovich
0970de3171
glx: updated comment
2008-10-21 08:20:43 -06:00
Xiang, Haihao
b4bf9acc32
i915: fix carsh in i830_emit_state. (bug #17766 )
2008-10-21 10:30:39 +08:00
Brian Paul
893ea47e44
glxswapcontrol: added -fullscreen option
2008-10-16 14:33:27 -06:00
Brian Paul
9a84d78c18
glxgears: for fullscreen, disable window borders the right way
2008-10-16 14:33:27 -06:00
Roland Scheidegger
73e1193632
fix span issue with really old ddx and non-tcl r100 chips
2008-10-16 16:25:52 +02:00
Brian Paul
a7b24ac02f
mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861
2008-10-16 08:23:53 -06:00
Kristian Høgsberg
4830809524
Update DRI2 implementation according to new specification.
2008-10-14 23:07:55 -04:00
Kristian Høgsberg
77c7f90ed4
Revert pointless reindents to avoid merge conflicts.
...
Why are we reindenting code that's work in progress...
2008-10-14 23:07:42 -04:00
RALOVICH, Kristóf
351de8aecc
glx: indent -br -i3 -npcs --no-tabs glxclient.h
2008-10-13 16:53:41 -06:00
RALOVICH, Kristóf
03b471d389
glx: indent -br -i3 -npcs --no-tabs glcontextmodes.h
2008-10-13 16:53:41 -06:00
RALOVICH, Kristóf
843a09cf5c
glx: indent -br -i3 -npcs --no-tabs glxextensions.c
2008-10-13 16:53:41 -06:00
RALOVICH, Kristóf
80c83c97fc
glx: indent -br -i3 -npcs --no-tabs glxextensions.h
2008-10-13 16:53:41 -06:00
RALOVICH, Kristóf
1d0a9e4377
glx: indent -br -i3 -npcs --no-tabs xfont.c
2008-10-13 16:53:41 -06:00
RALOVICH, Kristóf
4a3ccc6ca5
glx: indent -br -i3 -npcs --no-tabs xf86dristr.h
2008-10-13 16:53:41 -06:00
RALOVICH, Kristóf
4d2a381114
glx: indent -br -i3 -npcs --no-tabs XF86dri.c
2008-10-13 16:53:41 -06:00
RALOVICH, Kristóf
04a810beac
glx: indent -br -i3 -npcs --no-tabs xf86dri.h
2008-10-13 16:53:41 -06:00
RALOVICH, Kristóf
4c4cb1b5d1
glx: kill old K&R syntax in XF86dri.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
b9a2d35429
glx: indent -br -i3 -npcs --no-tabs vertarr.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
64085b2c2c
glx: indent -br -i3 -npcs --no-tabs singlepix.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
dd0edeb887
glx: indent -br -i3 -npcs --no-tabs single2.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
507808875d
glx: indent -br -i3 -npcs --no-tabs renderpix.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
6bfd57ecde
glx: indent -br -i3 -npcs --no-tabs render2.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
40c481dc91
glx: indent -br -i3 -npcs --no-tabs pixelstore.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
6581071c1d
glx: indent -br -i3 -npcs --no-tabs pixel.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
cfe7f20d0e
glx: indent -br -i3 -npcs --no-tabs packsingle.h
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
0cff716e70
glx: indent -br -i3 -npcs --no-tabs packrender.h
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
68583292b1
glx: indent -br -i3 -npcs --no-tabs indirect_window_pos.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
ccc03b427a
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_program.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
1c916736b8
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array_priv.h
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
9389aa3c0b
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.h
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
c868ab3dd1
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.c
2008-10-13 16:53:40 -06:00
RALOVICH, Kristóf
39df336635
glx: indent -br -i3 -npcs --no-tabs indirect_transpose_matrix.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
64d1c10e6c
glx: indent -br -i3 -npcs --no-tabs indirect_texture_compression.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
6020e6e66a
glx: indent -br -i3 -npcs --no-tabs glx_query.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
2d4c26b85e
glx: indent -br -i3 -npcs --no-tabs glx_pbuffer.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
bd6a3d5975
glx: indent -br -i3 -npcs --no-tabs glxhash.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
39c958944c
glx: indent -br -i3 -npcs --no-tabs glxhash.h
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
acb7e52430
glx: indent -br -i3 -npcs --no-tabs glxext.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
3a2d2fcd8a
glx: indent -br -i3 -npcs --no-tabs glxcurrent.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
1293356c60
glx: indent -br -i3 -npcs --no-tabs glxcmds.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
07c9bd246d
glx: indent -br -i3 -npcs --no-tabs glcontextmodes.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
f76724b767
glx: indent -br -i3 -npcs --no-tabs eval.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
60aa0918a1
glx: indent -br -i3 -npcs --no-tabs drisw_glx.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
4e88ae5639
glx: indent -br -i3 -npcs --no-tabs dri_glx.c
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
09c889b318
glx: indent -br -i3 -npcs --no-tabs dri_common.h
2008-10-13 16:53:39 -06:00
RALOVICH, Kristóf
4d86228321
glx: indent -br -i3 -npcs --no-tabs dri_common.c
2008-10-13 16:53:38 -06:00
RALOVICH, Kristóf
2e8d62be61
glx: indent -br -i3 -npcs --no-tabs dri2.h
2008-10-13 16:53:38 -06:00
RALOVICH, Kristóf
bca6e79a45
glx: indent -br -i3 -npcs --no-tabs dri2_glx.c
2008-10-13 16:53:38 -06:00
RALOVICH, Kristóf
66cc150770
glx: indent -br -i3 -npcs --no-tabs dri2.c
2008-10-13 16:53:38 -06:00
RALOVICH, Kristóf
f788a8ed69
glx: indent -br -i3 -npcs --no-tabs compsize.c
2008-10-13 16:53:38 -06:00
RALOVICH, Kristóf
ee3a6cec36
glx: indent -br -i3 -npcs --no-tabs clientattrib.c
2008-10-13 16:53:38 -06:00
RALOVICH, Kristóf
58b72103d3
glx: add a line of Emacs helping variables
2008-10-13 16:53:38 -06:00
RALOVICH, Kristóf
61eb4f50eb
glx: No need to zero a local variable.
...
My previous commit e206034863
introduced this.
2008-10-13 16:53:38 -06:00
RALOVICH, Kristóf
0b188d1cdc
glx: make INIT_MESA_SPARC more robust
...
Embed the macro body into do { ... } while(0) .
2008-10-13 16:53:38 -06:00
Xiang, Haihao
c238098bbc
i915: Texture instructions use r/t/oC/oD register as texture coordinate.
...
Fix http://bugs.freedesktop.org/show_bug.cgi?id=16287 .
2008-10-13 13:04:04 +08:00
Eric Anholt
5c39bad220
intel: Add acceleration for glDrawPixels(GL_STENCIL_INDEX).
...
This is nasty because there's no way in GL to output data to the stencil
buffer directly, so we have to do a dance to wrap the depth/stencil buffer
in an ARGB renderbuffer.
Improves performance of several oglconform testcases by better than a factor
of 2.
2008-10-11 03:17:08 -07:00
Brian Paul
24748268a3
mesa: fix asst. issues in _mesa_texstore_argb8888()
...
If we shift bytes into the texel word (or use the PACK_COLOR_8888 macro),
we don't have to worry about big vs. little endian. See comments about
texel formats in texformat.h.
Remove an unneeded/incorrect else-if clause that produced wrong results
on big-endian systems.
2008-10-10 16:34:08 -06:00
Brian Paul
bf9d9a9d01
mesa: include needed header
2008-10-10 16:34:08 -06:00
Brian Paul
f863ae1a04
mesa: remove unneeded includes
2008-10-10 16:34:08 -06:00
Brian Paul
85a3bf6dab
mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861
2008-10-10 16:34:08 -06:00
Brian Paul
3210a6d6c7
mesa: rename macro params to emphasize that there's no particular color ordering
2008-10-10 16:34:08 -06:00
Brian Paul
f63594bfef
mesa: remove unneeded includes
2008-10-10 16:34:08 -06:00
Ian Romanick
e700269441
intel: GLSL 1.20 is broken in Mesa, so disable it in the i965 driver
2008-10-10 11:47:43 -07:00
Eric Anholt
5e9cb42aa6
i965: Add missing intel_pixel_draw.c symlink to fix build.
2008-10-10 09:43:15 -07:00
Eric Anholt
7216679c19
i965: Accelerate depth textures with border color.
...
The fallback was introduced to fix bug #16697 , but made the test it was
fixing run excessively long.
2008-10-09 11:45:58 -07:00
Eric Anholt
91221483a6
i965: Actually hook up the accelerated DrawPixels support.
2008-10-09 10:23:47 -07:00
Eric Anholt
9aec1288ee
i915: Accelerate depth textures with border color.
...
The fallback was introduced to fix bug #16697 , but made the test it was
fixing run excessively long.
2008-10-08 23:55:58 -07:00
Brian Paul
a71b1af5ad
mesa: vertex emit debug code (disabled)
2008-10-08 09:33:56 -06:00
Brian Paul
5462d447aa
mesa: fix vertex format/attribute bug
...
If the tnl output attributes matches the swsetup input attributes we still
need to check if the desired vertex color type (float vs. chan) has changed
so that we use the right emit functions.
Fixes a conformance failure found with logicop test at pathlevel 3.
2008-10-08 09:33:56 -06:00
Eric Anholt
902727b7e3
mesa: Pass the context to query object delete cb to avoid null dereference.
2008-10-07 18:52:12 -07:00
Eric Anholt
c157cfc637
i965: Add ARB_occlusion_query support.
2008-10-07 18:52:12 -07:00
Eric Anholt
fc19536aa9
intel: Push flushing for cliprects changes down into the cliprects changes.
...
This lets us short-circuit when we're leaving the same cliprects in place,
which becomes quite common with metaops clears, and may be useful for some of
our FBO paths.
2008-10-07 18:52:12 -07:00
Xiang, Haihao
94d3a30df7
i965: Fix a potential assertion failure.
2008-10-08 09:30:12 +08:00
Brian Paul
7cb723a3fd
mesa: pass 'mask', not NULL to renderbuffer->Put functions
...
Fixes bug 17800.
2008-10-07 16:52:47 -06:00
Brian
4f4147eadd
mesa: fix convolve/convolution mix-ups
2008-10-06 17:10:22 -06:00
Brian Paul
f8baad2d25
mesa: set FRAG_BIT_FOGC bit in InputsUsed if FogOption!=GL_NONE
2008-10-06 12:29:29 -06:00
Brian Paul
6e34fc0d37
mesa: adjust texcoords for swrast sprite points.
...
Fixes glean pointSprite test w/ software rendering
2008-10-06 11:34:01 -06:00
Brian Paul
145d49838f
mesa: fix static library construction
...
If the .a is made of other .a files, extract the objects from the later.
2008-10-06 11:01:31 -06:00
Brian Paul
b0ca50bd38
mesa: updated _mesa_delete_query() comments
2008-10-06 09:32:33 -06:00
Brian Paul
382911bdbc
mesa: add missing GLcontext param to _mesa_delete_query().
...
Fixes vtk crash and others.
2008-10-06 09:26:45 -06:00
Eric Anholt
91d0020eec
i915: Refine the texture indirect lookup accounting.
...
Without this, we would reject programs which sampled multiple times from
registers defined in the same phase (block of instructions with the same
texture indirection count), as each sample would count as a new phase
beginning. Instead, keep track of which phases registers were written in,
and only bump phase when we're reading from one generated in this phase.
On the other hand, we failed to count oC or oD texture samples as being new
phases.
Bug #17865 .
2008-10-04 18:40:32 -07:00
Ian Romanick
db9ba91971
intel: Don't advertise unsupported extensions on pre-965 hardware
...
Move GL_ARB_texture_non_power_of_two and GL_ATI_separate_stencil
from the generic extension list to the 965-specific list. Neither
extension is supported on i830-class hardware, and
GL_ATI_separate_stencil is not supported on i915-class hardare.
GL_ARB_texture_non_power_of_two is supported on i915-class hardare and
is already in the i915-specific list.
2008-10-03 12:16:04 -07:00
Ian Romanick
4741dbcbbc
Unify ARB_depth_texture and SGIX_depth_texture
...
The ARB extension is a superset of the older SGIX extension. Any
hardware that can support the SGIX version can also support the ARB
version. In Mesa, any driver that supports one also supports the
other. This unification just simplifies some bits of code.
2008-10-01 20:38:10 -07:00
Eric Anholt
17fdd1ab3b
i965: sampler default color ends up in texture cache, not instructions.
...
See volume 4, SAMPLER_BORDER_COLOR_STATE programming notes.
2008-10-01 16:59:16 -07:00
Eric Anholt
df6ae3f0a3
i965: Fix overwriting of depth override for SetTexOffset.
...
Fixes black borders around windows in compiz. Bug #17233 .
2008-10-01 14:15:17 -07:00
Ian Romanick
08b9e29c1d
intel: Clean-up the extension string madness!
...
- Sort extensions by ARB, then EXT, then vendor by name
- Remove redundant (only one of GL_{ARB,EXT,NV}_texture_rectangle) or
duplicate extension strings
2008-09-29 18:50:05 -07:00
Ian Romanick
3ab4b2066f
GLSL: Implement GL_OBJECT_TYPE_ARB query
...
The GL_OBJECT_TYPE_ARB query is handled directly in
_mesa_GetObjectParamterivARB because it is only supported in the
extension version of the shanding language API. glGetProgramiv and
glGetShaderiv should not accept this enum.
2008-09-29 12:30:05 -07:00
Ian Romanick
905d8e0742
GLSL: Implement _mesa_get_handle
...
Implementing _mesa_get_handle in using
glGetIntegerv(GL_CURRENT_PROGRAM, ...) allows glGetHandleARB to work.
2008-09-29 12:27:00 -07:00
Ian Romanick
d806d451e6
GLSL: AttachShader returns INVALID_OPERATION for repeated attach
...
The GL_ARB_shader_objects spec says that glAttachShaderARB is supposed
to return GL_INVALID_OPERATION if a shader is attached to a program
where it is already attached. _mesa_attach_shader perviously returned
without error in this case.
2008-09-29 12:18:06 -07:00
Jouk Jansen
fc13269b82
mesa: asst updates for VMS
2008-09-29 08:35:05 -06:00
Shunichi Fuji
e095d5812a
mesa: drop calloc from _mesa_get_fixed_func_vertex_program
...
Signed-off-by: Shunichi Fuji <palglowr@gmail.com >
2008-09-29 10:38:45 +01:00
Ian Romanick
2b8d8989fb
Use 3Dnow! x86-64 routines only on processors that support 3Dnow!
...
Added an x86-64 CPUID function and use it to detect 3Dnow! If 3Dnow!
is available, use _mesa_3dnow_transform_points4_3d_no_rot,
_mesa_3dnow_transform_points4_perspective,
_mesa_3dnow_transform_points4_2d_no_rot, and _mesa_3dnow_transform_points4_2d.
This fixes long standing bug #8724 .
2008-09-28 20:32:05 -07:00
Ian Romanick
b5d59222cc
Remove TNL-to-VP tracking from i965
...
The i965 driver previously had it's own set of code to convert
fixed-function TNL state to a vertex program. Core Mesa has code to
do this, so there is no reason to duplicate that effort in the driver.
In fact, this duplication leads to bugs when other aspects of the Mesa
infrastructure change.
2008-09-28 20:32:05 -07:00
Tobias Jakobi
2e5d717007
glapi: add DISPATCH_FUNCTION_SIZE
2008-09-27 08:51:45 +01:00
Tobias Jakobi
a23026effc
glapi: add gl_dispatch_functions_start and end
2008-09-27 08:47:55 +01:00
Eric Anholt
7d99ddcb2b
intel: Fix a number of memory leaks on context destroy.
2008-09-26 15:39:20 -07:00
Jeremy Huddleston
8338cc25f9
configs: darwin: Don't build GLw
...
(cherry picked from commit ef688ba1ee366a8937a41075cbe8b76a9bf75013)
2008-09-26 12:37:31 -07:00
Brian Paul
a4a5a37f27
mesa: remove invalid assertions that programs have parameters
...
Fixes failure with demos/fplight.c
2008-09-26 07:45:06 -06:00
Brian Paul
4bc39c58eb
mesa: fix assertion in _mesa_reference_program()
2008-09-26 07:40:45 -06:00
Brad King
ee80c64be8
mesa: fix param indexing
2008-09-26 07:40:05 -06:00
Brian
1e3a44fab0
mesa: fix cast/conversion for optional code
2008-09-25 19:57:34 -06:00
Brian Paul
b3c3bc63f0
mesa: fix typo (s/feadback/feedback/). Fixes broken selection/feedback.
2008-09-25 18:55:52 -06:00
Brian Paul
8124faf89d
mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
2008-09-25 11:54:00 -06:00
Brian Paul
6222eb3fcd
mesa: fix some VBO buffer object issues
...
The VBO module may use a real VBO or a malloc'd buffer for vertex storage.
Be careful not to accidentally replace the later with the former when drawing.
Check if using a real VBO at destroy time to prevent a double-free.
2008-09-25 11:03:46 -06:00
Sam Hocevar
507ef82077
mesa: fix function params to match prototypes
2008-09-25 09:58:27 -06:00
Sam Hocevar
7be5411ce6
mesa: prevent the slang code generator from aborting when faced with a sampler variable redeclaration.
2008-09-25 09:53:09 -06:00
Sam Hocevar
561787e697
i965: support for sin() and cos() in vertex shaders.
2008-09-25 09:49:36 -06:00
Sam Hocevar
831bfb9053
i965: more meaningful message for unsupported opcodes.
2008-09-25 09:49:18 -06:00
Eric Anholt
c5945c2d17
intel: Fix clears to depth_stencil texture attachments.
...
Broken by 0adfd10210
, showed up as an assertion
failure in a software fallback in the shadowtex demo when we failed to
recognize the texture format.
2008-09-24 15:13:19 -07:00
Brian
1fe385fdc9
set SamplerUnit[] entry in load_texture() just to be safe
...
(cherry picked from commit fce4612f8a
)
2008-09-24 10:15:07 -07:00
Brian
dff0b0e772
use PROGRAM_CONSTANT instead of PROGRAM_STATE_VAR when generating immediates/literals
...
(cherry picked from commit fdc8636bdc
)
2008-09-24 10:13:46 -07:00
Brian
9b7e5a51f4
set program->SamplersUsed bit when using a texture instruction
2008-09-24 10:13:31 -07:00
Brian
93fef22d05
Remove ctx field from texenvprog_cache
2008-09-24 10:11:37 -07:00
Brian
fb3c41f504
include programopt.h
...
(cherry picked from commit 83fad68ec1
)
2008-09-24 10:04:31 -07:00
Brian
c81cce7831
Disable vertex shader fog, compute fog in fragment shader.
2008-09-24 10:04:17 -07:00
Brian
19d77d6cfa
temporarily set the FRAG_BIT_FOGC bit in InputsRead when fog is enabled
...
(cherry picked from commit 63be96bdc7
)
2008-09-24 10:03:27 -07:00
Julien Cristau
84bb8fc695
Prepare changelog for upload
2008-09-24 14:28:28 +02:00
Julien Cristau
872cb1a0dd
intel: don't warn about TTM init failure.
2008-09-24 14:25:30 +02:00
Julien Cristau
ee80a3a623
Remove the build-dep on dri2proto, DRI2 support has been removed.
2008-09-24 12:55:15 +02:00
Keith Whitwell
8e7d941d7a
mesa: fix main/ prefix in include
2008-09-23 21:08:50 -07:00
Keith Whitwell
33fef8be82
vbo: unmap and remap immediate vbo before/after each draw.
...
Also use BufferData(NULL) to get fresh storage and avoid synchronous
operation where we would have to flush and wait for the fence after each
draw because of the map.
This will chew through a whole load of buffer space on small draws, so
it isn't a proper solution. Need to support a no-fence or append mapping
mode to do this right, or use user buffers.
2008-09-23 18:26:17 -07:00
Brian
6f765fbde4
added vbo_use_buffer_objects() to specify that immediate mode data should be put into bufferobjects
2008-09-23 18:26:00 -07:00
Keith Whitwell
b36bc54d3c
vbo: seed initial max_element value with a more likely candidate
...
(cherry picked from commit 026e7731e5
)
2008-09-23 18:05:48 -07:00
Brian Paul
9acf207277
mesa: s/GL_POLYGON+1/PRIM_OUTSIDE_BEGIN_END/
...
(cherry picked from commit 8a369b909a
)
2008-09-23 17:36:01 -07:00
Brian Paul
5b98236e75
mesa: glsl: fix glGetUniform for matrix queries
...
(cherry picked from commit 7a6eba54d0
)
2008-09-23 17:34:59 -07:00
Brian Paul
eda291e316
mesa: glsl: fix a number of glUniform issues
...
Additional error checking.
Allow setting elements of uniform arrays. This involves encoding both
a uniform location and a parameter offset in the value returned by
glGetUniformLocation().
Limit glUniform[if]v()'s count to the size of the uniform array.
When setting bool-valued uniforms, convert all float/int values to 0 or 1.
2008-09-23 17:33:49 -07:00
Brian Paul
bda6ad273d
mesa: glsl: fix error check in get_uniformfv()
...
(cherry picked from commit 18cd9c229a
)
2008-09-23 17:33:19 -07:00
José Fonseca
452a592ca4
mesa: Apply MSVC portability fixes from Alan Hourihane.
2008-09-23 17:20:38 -07:00
Brian Paul
9118b02fd0
mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()
2008-09-23 17:11:25 -07:00
Brian Paul
c79779aff0
mesa: add fwd decl of fill_in_entrypoint_offset()
...
(cherry picked from commit b1eff0228b
)
2008-09-23 17:09:24 -07:00
Brian Paul
ec76910187
mesa: new gl_fragment_program fields indicating use of fog, front-facing, point coord
...
(cherry picked from commit d7a7b0a10d
)
2008-09-23 17:01:05 -07:00
Brian
03bafd1f9f
Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in the drivers.
...
This should probably be pulled into main-line Mesa...
(cherry picked from commit 324ecadbfd
)
2008-09-23 16:59:56 -07:00
Brian Paul
a97226352f
mesa: refactor: move GetProcAddress code from glapi.c into new glapi_getproc.c file
2008-09-23 16:56:23 -07:00
Eric Anholt
d533da2db8
i965: Cope with batch getting flushed in the middle of batchbuffer emits.
...
This isn't required for GEM (at least, yet), but the check_aperture code
for non-GEM results in batch getting flushed during emit. brw_state_upload
restarts state emits, but a bunch of the state emit functions were assuming
that they would be called exactly once, after prepare and before new_batch.
Bug #17179 .
2008-09-23 15:53:29 -07:00
Eric Anholt
4b038e24b0
intel: Add missing include files for meta drawpixels since mesa shuffling.
2008-09-23 15:32:41 -07:00
Eric Anholt
f85ea6837d
intel: Replace pbo-only drawpixels function with a generic Mesa metaops.
...
Improves performance of some oglconform regression tests 9x.
2008-09-23 13:31:19 -07:00
Eric Anholt
15487e46a2
i915: Fix overlapping CopyPixels with negative pixel zoom.
...
Fixes a failure in pixel-pos.c oglconform test.
2008-09-23 13:31:12 -07:00
Eric Anholt
b9532f078a
i915: fix crash in flush_prim -> wait_flips -> flush_batch -> flush_prim.
2008-09-23 13:30:03 -07:00
Timo Aaltonen
e700c5ad99
Update the changelog, refresh patch 04.
2008-09-23 16:09:00 +03:00
Timo Aaltonen
08c0ec7a89
Merge commit 'mesa_7_2' into debian-experimental
...
Conflicts:
include/GLES/egl.h
2008-09-23 16:06:40 +03:00
Ian Romanick
2511d57fa4
i965: Adapt to new TNL program tracking semantics
...
This fixes bugzilla #17718 .
2008-09-22 17:23:40 -07:00
Michel Dänzer
ed4c6cbe01
r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends.
2008-09-22 11:49:34 +02:00
Michel Dänzer
78f4a695ad
Remove incorrect test from mmAllocMem.
...
0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was
broken by this.
2008-09-22 11:48:26 +02:00
Brian Paul
6fd15dd806
mesa: allow for extra per-context init
...
(cherry picked from commit 815cdcfbc0
)
2008-09-21 22:13:57 -07:00
Brian Paul
1b7e909845
mesa: texture crop rect state
...
(cherry picked from commit c01fbc7866
)
2008-09-21 22:13:57 -07:00
Brian Paul
93c90d34d1
mesa: set point state
...
(cherry picked from commit af3d9dba56
)
2008-09-21 22:13:57 -07:00
Brian Paul
868c09a267
mesa: fix some feature tests
...
(cherry picked from commit 74b14fe6dd
)
2008-09-21 22:13:57 -07:00
Brian Paul
8122ab2dfd
mesa: fix some pixel transfer state tests for depth formats
...
(cherry picked from commit 966e199e40
)
2008-09-21 22:13:57 -07:00
Brian Paul
6bc8749cd5
mesa: fix issues causing warnings on Windows
2008-09-21 22:13:57 -07:00
Michal Krol
9614eac85d
mesa: Silence compiler warnings on Windows.
2008-09-21 22:13:57 -07:00
Brian Paul
ce1685ce94
mesa: comments about vectors vs components
2008-09-21 22:13:57 -07:00
Brian Paul
eb10fa3ed6
mesa: remove debug code
2008-09-21 22:13:57 -07:00
Brian Paul
6246dd890f
mesa: implement glGetUniformiv() with new ctx->Driver function
...
The old implementation could overwrite the caller's param buffer.
2008-09-21 22:13:56 -07:00
Brian Paul
48cba703fa
mesa: added case for fixed pt
2008-09-21 22:13:56 -07:00
Brian Paul
1cf2c8a043
mesa: point size arrays
2008-09-21 22:13:56 -07:00
José Fonseca
f8e50dd796
mesa: Replace deprecated __MSC__ macro.
2008-09-21 22:13:56 -07:00
José Fonseca
60325331a8
mesa: More signed/unsigned float/integer fixes.
2008-09-21 22:13:56 -07:00
José Fonseca
457d7218b8
mesa: Use appropriate unsigned/signed, float/integer types.
2008-09-21 22:13:56 -07:00
José Fonseca
88f729e4ec
mesa: Use _mesa_bsearch.
2008-09-21 22:13:56 -07:00
José Fonseca
baa76e9aa2
mesa: bsearch implementation for WinCE.
2008-09-21 22:13:56 -07:00
José Fonseca
2e8af5ffcf
mesa: ASSERT macro is already defined by WinCE headers.
...
Even when just the standard headers are used....
2008-09-21 22:13:56 -07:00
Brian Paul
c115616bda
mesa: init ctx->RenderMode
2008-09-21 22:13:56 -07:00
Brian Paul
d17485fef9
mesa: GL_BYTE vertex/texcoord arrays
2008-09-21 22:13:55 -07:00
Brian Paul
394c1d1c53
mesa: initial support for fixed-pt vertex arrays
2008-09-21 22:13:55 -07:00
Brian Paul
bb00f09f1b
mesa: refactor: move initialization of DefaultPacking state.
2008-09-21 22:13:55 -07:00
Brian Paul
9b8b58b79a
mesa: fix errors in prev commit
2008-09-21 22:13:55 -07:00
Brian Paul
3a4bed8f08
mesa: revamp glBlendFunc loopback
2008-09-21 22:13:55 -07:00
Brian Paul
85f553d3c1
mesa: fix some FEATURE_x tests
2008-09-21 22:13:55 -07:00
Brian Paul
b51d73dd94
mesa: test for FEATURE_ATI_fragment_shader
2008-09-21 22:13:55 -07:00
Brian Paul
715715e230
mesa: fix ReadBuffer initialization
2008-09-21 22:13:55 -07:00
Brian Paul
cd4d4f590f
mesa: FEATURE_dispatch to control dispatch table usage
2008-09-21 22:13:55 -07:00
Brian Paul
2dbc515a66
mesa: move some glapi bits around
...
Move _glapi_proc typedef from glapitable.h to glapi.h
Also, don't include glapitable.h from glapi.h
Before we were including the huge glapitable.h file in every .c file.
2008-09-21 22:13:55 -07:00
Brian Paul
d22ef6bcba
mesa: remove some temp debug code
2008-09-21 22:13:54 -07:00
Brian Paul
4e3ae76fea
mesa: check FEATURE_ARB_occlusion_query
2008-09-21 22:13:54 -07:00
Brian Paul
049a59a87c
mesa: fix typo: s/stacks/stack/
2008-09-21 22:13:54 -07:00
Brian
74c64fa748
code refactoring, new next_mipmap_level_size() function
...
(cherry picked from commit c22d9152e3
)
2008-09-21 22:13:54 -07:00
Brian
e93243f8b7
added _mesa_tex_target_to_face()
...
(cherry picked from commit b52ce6341f
)
2008-09-21 22:13:54 -07:00
Brian
abb465cdc7
refactor code, export _mesa_generate_mipmap_level()
2008-09-21 22:13:54 -07:00
Brian
12dc9c99b9
move _mesa_format_to_type_and_comps() to texformat.c
...
(cherry picked from commit 42eac65da4
)
2008-09-21 22:13:54 -07:00
Keith Whitwell
b082002379
mesa: pull in mipmap.c changes from gallium-0.2
2008-09-21 22:13:54 -07:00
Brian Paul
facfb44d37
mesa: remove unneeded #include
...
(cherry picked from commit 6363960db5
)
2008-09-21 22:13:54 -07:00
Brian Paul
ddd630ef90
mesa: refactor: move various ENUM_TO_x macros into macros.h
2008-09-21 22:13:53 -07:00
Brian Paul
ae1fdc1523
mesa: refactor: move glTexParameter-related functions into new texparam.c file
2008-09-21 22:13:53 -07:00
Brian Paul
11ebfd22bb
mesa: refactor: move glTexEnv-related functions into new texenv.c file
...
(cherry picked from commit 7ecac78ab5
)
2008-09-21 22:13:52 -07:00
Brian Paul
10db6c2d81
mesa: refactor: move glTexGen-related functions into new texgen.c file
...
(cherry picked from commit 27049189d6
)
2008-09-21 22:13:52 -07:00
Brian Paul
4fc71f3ec2
mesa: refactor: fix some FEATURE_ typos, mistakes
...
(cherry picked from commit e4cfe0854a
)
2008-09-21 22:13:52 -07:00
Keith Whitwell
34a61c66fd
mesa: refactor: move #define FEATURE flags into new mfeatures.h file
...
Also, check the FEATURE flags in many places.
(cherry picked from commit 40d1a40f29
)
Conflicts:
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
2008-09-21 22:13:52 -07:00
Brian Paul
24172fe595
mesa: refactor: move _mesa_update_minmax/histogram() into image.c
...
(cherry picked from commit eded7f010d
)
2008-09-21 22:13:52 -07:00
Brian Paul
c132e2b1db
mesa: refactor: move multisample-related functions into new multisample.c file
2008-09-21 22:13:52 -07:00
Brian Paul
e48defc980
mesa: refactor: move _mesa_resizebuffers(), _mesa_ResizeBuffersMESA() to framebuffer.c
...
(cherry picked from commit 9091015a97
)
2008-09-21 22:13:51 -07:00
Brian Paul
5ab1d0acea
mesa: refactor: move glClear, glClearColor into new clear.c file.
2008-09-21 22:13:51 -07:00
Brian Paul
55e341c4c2
mesa: refactor: move scissor functions into new scissor.c file
...
(cherry picked from commit 4be7296bfc
)
2008-09-21 22:13:51 -07:00
Brian Paul
18d2822905
mesa: refactor: move pixel map/scale/bias code into image.c
...
pixel.c is just the API-related code now.
2008-09-21 22:13:51 -07:00
Brian Paul
533c1dbe75
mesa: refactor: new _mesa_init_pixelstore() function
...
(cherry picked from commit 5f91007f99
)
2008-09-21 22:13:51 -07:00
Brian Paul
c9e5671691
mesa: refactor: move _mesa_init_exec_table() into new api_exec.c file
...
(cherry picked from commit b36e6f0baf
)
2008-09-21 22:13:51 -07:00
Brian Paul
28876dd511
mesa: refactor: move glReadPixels code into new readpix.c file
2008-09-21 22:13:51 -07:00
Brian
87534210bb
Add some FLUSH_CURRENT() calls.
...
Without these we can find ourselves in _mesa_load_state_parameters()
computing derived lighting/material values whhen the current material
properties haven't been updated from the VBO.
This may be a somewhat wide-spread problem that needs more attention...
(cherry picked from commit 49adf51eee
)
2008-09-21 22:13:51 -07:00
Brian Paul
411d6672a6
mesa: refactor: move glPixelStore function into new pixelstore.c file
2008-09-21 22:13:51 -07:00
Brian Paul
9228f1c881
mesa: remove EXT/NV suffixes from _mesa_PointParameter functions
2008-09-21 22:13:50 -07:00
José Fonseca
d1e1a76f62
glut: Remove EOF characters.
2008-09-22 12:09:58 +09:00
Benjamin Close
7c1fda71ac
i965: fix compilation
...
Found By: Tinderbox
2008-09-22 12:04:16 +09:30
Chris Rankin
a7573d805e
Fix X86 compilation.
2008-09-21 23:56:17 +02:00
Keith Whitwell
45efcc44c7
Remove CVS keywords.
...
Cherry-picked from gallium-0.1
Conflicts:
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/glxclient.h
src/glx/x11/glxext.c
src/mesa/drivers/dri/ffb/ffb_dd.h
src/mesa/drivers/dri/ffb/ffb_points.h
src/mesa/drivers/dri/gamma/gamma_context.h
src/mesa/drivers/dri/gamma/gamma_macros.h
src/mesa/drivers/dri/i810/i810context.h
src/mesa/drivers/dri/r128/r128_dd.h
src/mesa/drivers/dri/tdfx/tdfx_dd.h
2008-09-21 11:00:44 -07:00
José Fonseca
64dc397d8b
mesa: Prefix main includes with dir to avoid conflicts.
...
Eliminate a couple of differences with gallium-0.2
2008-09-21 10:48:40 -07:00
Keith Whitwell
2ea3ef9a80
mesa: remove dead file
2008-09-21 10:34:04 -07:00
Keith Whitwell
c07e274f44
mesa: add explict float casts
2008-09-21 10:31:15 -07:00
Keith Whitwell
32ef6e7583
mesa: move fixed function vertex program builder from tnl to core mesa
...
Also unify caching of fragment and vertex programs in shader/prog_cache.c`
Brought across from gallium-0.2
2008-09-21 09:46:00 -07:00
Brian Paul
e019ead5d7
mesa: add parenthesis
...
(cherry picked from commit c366fd83b6
)
2008-09-21 09:45:41 -07:00
Keith Whitwell
5a46e17671
mesa: standardize on C99's uint*_t instead of u_int*_t
2008-09-21 09:45:00 -07:00
José Fonseca
3474e9de92
mesa: Remove assyntax.h include from generated matypes.h.
...
matypes.h doesn't really depend on assyntax.h; assyntax.h is only present
on x86; and this way we remove the need of grep being available (which is
relevant for scons and non-unix platforms).
(cherry picked from commit fc286ff3ba
)
2008-09-21 09:44:37 -07:00
Keith Whitwell
6b146214dc
mesa: move rastpos helper to tnl
2008-09-21 09:44:30 -07:00
Keith Whitwell
7ce597508e
mesa: improved driver query interface
...
Brought over from gallium-0.2 branch.
2008-09-21 09:44:25 -07:00
Brian Paul
35fe0e56e6
mesa: docs: remove parenthesis
2008-09-20 09:28:22 -06:00
Brian Paul
69e5311ad3
mesa: set 7.2 version for tarballs
2008-09-20 09:24:17 -06:00
Brian Paul
e884c4db2b
mesa: prep for 7.2 release
2008-09-20 09:23:50 -06:00
Adam Jackson
e681bee04e
Update to SGI FreeB 2.0.
...
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
2008-09-20 09:21:34 -06:00
Julien Cristau
07c1fcc604
Prepare changelog for upload
2008-09-20 16:32:02 +02:00
Adam Jackson
dc8058c337
Update to SGI FreeB 2.0.
...
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
2008-09-19 17:16:53 -04:00
Julien Cristau
7959b95efa
Update debian/copyright to the SGI Free Software License B, version 2.0.
...
It now mirrors the free X11 license used by X.Org (closes : #368560 ).
http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html
2008-09-19 18:03:59 +02:00
Brian
19d9c81b8c
glx: re-add glapi/ path
2008-09-18 21:22:08 -06:00
Brian
cfc4b4c989
mesa: remove unneeded s_drawpix.h header
2008-09-18 20:31:05 -06:00
Brian
4eb95ce807
glx: added "glapi/" prefix to include
2008-09-18 20:27:16 -06:00
Chris Rankin
8d41e4536d
mesa: fix asst path/include mistakes in prev commits
2008-09-18 16:48:11 -06:00
Brian Paul
58dce864e6
mesa: fix null ptr deref bug in _tnl_InvalidateState(), bug 15834
2008-09-18 15:29:57 -06:00
Brian Paul
3dd48d903f
document _tnl_InvalidateState() fix
2008-09-18 15:28:31 -06:00
Brian Paul
e0ea4337fc
mesa: fix null ptr deref bug in _tnl_InvalidateState(), bug 15834
2008-09-18 15:27:55 -06:00
Brian Paul
ecadb51bbc
mesa: added "main/" prefix to includes, remove some -I paths from Makefile.template
2008-09-18 15:17:05 -06:00
Brian Paul
374e7fd6cc
mesa: prefix more #includes with "main/"
2008-09-18 13:46:47 -06:00
Brian Paul
06370a91b3
mesa: remove a bunch of -I paths from INCLUDE_DIRS
2008-09-18 13:34:57 -06:00
Brian Paul
a25e1aa0aa
glx: remove #include "glheader.h" lines
...
Was only used to get the PUBLIC/USED macros.
Also, replace "GL_FALSE" with "False" in a couple places.
2008-09-18 13:26:30 -06:00
Brian Paul
3537da87de
glx: remove depency on glheader.h and GLboolean type in XF86DRI code
...
Return Bool instead of GLboolean to match other functions.
Define PUBLIC/USED macros locally.
2008-09-18 13:23:06 -06:00
Brian Paul
bbd287103d
mesa: prefix a bunch of #include lines with "main/".
...
This is another step toward removing a whole bunch of -I flags from
the cc commands. Still need to address driver code...
2008-09-18 12:26:54 -06:00
Brian Paul
5e530d8384
mesa: fix bug in previous changes to _slang_resolve_attributes()
2008-09-17 09:13:55 -06:00
Brian Paul
6290d7fd29
mesa: fix bug in previous changes to _slang_resolve_attributes()
2008-09-17 09:13:28 -06:00
Eric Anholt
904f31a624
intel: Destroy bufmgr in screen destroy, not context.
...
Caused server crashes on second context creation since
7e0bbdcf03
.
Bug #17600 .
2008-09-16 17:02:41 -07:00
Brian Paul
84ad182ab8
document glBindAttribLocation fixes
2008-09-16 16:37:17 -06:00
Brian Paul
27341a97a1
mesa: rework GLSL vertex attribute binding
...
Calls to glBindAttribLocation() should not take effect until the next time
that glLinkProgram() is called.
gl_shader_program::Attributes now just contains user-defined bindings.
gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
2008-09-16 16:28:36 -06:00
Brian Paul
a155ead515
mesa: rework GLSL vertex attribute binding
...
Calls to glBindAttribLocation() should not take effect until the next time
that glLinkProgram() is called.
gl_shader_program::Attributes now just contains user-defined bindings.
gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
2008-09-16 15:58:05 -06:00
Brian Paul
5b0f652456
mesa: fix display list regression (check if save->prim_count > 0 in vbo_save_EndList())
2008-09-16 13:32:13 -06:00
Brian Paul
d43951192b
mesa: fix display list regression (check if save->prim_count > 0 in vbo_save_EndList())
2008-09-16 13:23:01 -06:00
Brian Paul
1be50e1638
fix msaa enable/disable bug
2008-09-15 17:15:51 -06:00
Brian Paul
9d48a7832b
mesa: fix MSAA enable state in update_multisample()
2008-09-15 17:14:53 -06:00
Brian Paul
4fefa29d8c
mesa: fix MSAA enable state in update_multisample()
2008-09-15 17:14:41 -06:00
Brian Paul
ef479d9f2a
document display list bug fix
2008-09-15 09:22:07 -06:00
Brian Paul
fc04604856
mesa: remove some assertions that are invalid during context tear-down
2008-09-15 09:20:30 -06:00
Keith Whitwell
ef2bd7860f
mesa: get another class of degenerate dlists working
...
Primitive begin in one dlist, end in another.
2008-09-15 09:20:23 -06:00
Brian Paul
d36f4ef16b
mesa: remove some assertions that are invalid during context tear-down
2008-09-15 09:07:32 -06:00
Keith Whitwell
bd953e872f
mesa: get another class of degenerate dlists working
...
Primitive begin in one dlist, end in another.
2008-09-15 13:49:04 +01:00
Keith Whitwell
a30d2c5727
add dlist-degenerate test case
2008-09-15 13:49:04 +01:00
Shane Blackett
dca8b4c964
glut: s/glut_fbc.c/glut_fcb.c/
2008-09-14 17:51:53 -06:00
Shane Blackett
641b80275b
glut: s/glut_fbc.c/glut_fcb.c/
2008-09-14 17:51:01 -06:00
Brian Paul
419353dc2f
mesa: Makefile: 7.2 release candidate 1
2008-09-13 16:06:12 -06:00
Brian Paul
38d3b2262b
mesa: documentation updates for 7.2 release
2008-09-13 14:43:54 -06:00
Brian Paul
4db2a7f36c
updated Cell driver info
2008-09-13 14:39:39 -06:00
Brian Paul
1145042fd2
Mesa: version bumps for 7.2 release
2008-09-13 14:36:35 -06:00
Brian Paul
772131280a
document 7.2 bug fixes, etc
2008-09-13 14:36:17 -06:00
Jakub Bogusz
68a19e353e
tdfx: fix crash and lack of visuals bug
2008-09-13 14:35:02 -06:00
Jakub Bogusz
ee913c0fcc
tdfx: fix crash and lack of visuals bug
2008-09-13 14:34:51 -06:00
Guillaume Melquiond
cd1804c43a
i915: fix himask constant init for 64-bit build
2008-09-13 14:26:35 -06:00
Guillaume Melquiond
253784d45e
glx: fix 64-bit datatype issue
2008-09-13 14:26:25 -06:00
Guillaume Melquiond
463d19d477
mesa: return after _mesa_problem() calls
2008-09-13 14:26:18 -06:00
Guillaume Melquiond
6e4fd90ca5
mesa: #include <stdio.h>
2008-09-13 14:26:13 -06:00
Guillaume Melquiond
06188c0c5c
remove invalid XDestroyWindow() call
2008-09-13 14:26:06 -06:00
Guillaume Melquiond
dec9097647
silence warning
2008-09-13 14:25:59 -06:00
Guillaume Melquiond
e234339dba
GLU: fix asst warnings
2008-09-13 14:25:53 -06:00
Guillaume Melquiond
87ccb9504d
i915: fix himask constant init for 64-bit build
2008-09-13 14:25:02 -06:00
Guillaume Melquiond
811d8b86eb
glx: fix 64-bit datatype issue
2008-09-13 14:24:31 -06:00
Guillaume Melquiond
11a889db8f
mesa: return after _mesa_problem() calls
2008-09-13 14:23:39 -06:00
Guillaume Melquiond
d2e0504d4e
mesa: #include <stdio.h>
2008-09-13 14:23:14 -06:00
Guillaume Melquiond
5d4c8ec5e0
remove invalid XDestroyWindow() call
2008-09-13 14:22:15 -06:00
Guillaume Melquiond
ee2c8d6d3e
silence warning
2008-09-13 14:21:50 -06:00
Guillaume Melquiond
6e51febc6b
GLU: fix asst warnings
2008-09-13 14:20:14 -06:00
Eric Anholt
8db761409d
intel: Add a width field to regions, and use it for making miptrees in TFP.
...
Otherwise, we would use the pitch as width of the texture, and compiz would
render the pitch padding on the right hand side.
2008-09-12 15:48:13 -07:00
Eric Anholt
bdc8ac4ae2
Finish off the previous fix for TFP.
...
A couple of those lines of debug printfs I deleted weren't actually debug
printfs.
2008-09-12 15:09:43 -07:00
Eric Anholt
34bba445a1
intel: Don't segfault on TFP from a bad drawable.
2008-09-12 13:49:23 -07:00
Eric Anholt
201d3419a6
intel: Remove dead allow_batchbuffer param.
2008-09-12 13:49:23 -07:00
Ian Romanick
bb09d23e92
Remove DRI2 support
...
Remove support for the original incarnation of DRI2. This version has
since been abandoned and will never ship. This eliminates a build
dependency on a component that only exists in Fedora 9 and in now-dead
up-stream development trees.
I also recommend that we spin a Mesa 7.1.1 release with this patch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2008-09-12 13:48:14 -07:00
George Sapountzis
d3dc95e26a
dri/swrast: fix swapBuffers after dri2
2008-09-12 12:43:10 +03:00
Xiang, Haihao
1ffbcddb6f
i965: Add support for G41 chipset which is another 4 series.
...
(cherry picked from commit b2e083eba2
)
2008-09-12 09:29:00 +08:00
Xiang, Haihao
b2e083eba2
i965: Add support for G41 chipset which is another 4 series.
2008-09-12 09:25:34 +08:00
Brice Goglin
5cd892a4e4
Fix grammar and punctuation in glxinfo(1)
2008-09-11 19:13:46 +02:00
Shane Blackett
4d42c5bebf
added 24bpp support
2008-09-11 08:36:03 -06:00
Shane Blackett
bc3b2a5d7a
Fixes for Mingw
2008-09-11 08:36:03 -06:00
Shane Blackett
33cf8f5c06
added 24bpp support
2008-09-11 08:35:37 -06:00
Eric Anholt
35fd72756a
intel: track move of bo_exec from drivers to bufmgr.
2008-09-10 13:59:45 -07:00
Eric Anholt
3628185f56
intel: track bufmgr move to libdrm_intel and bufmgr_fake irq emit/wait change.
2008-09-10 13:59:45 -07:00
Eric Anholt
7e0bbdcf03
intel: Move the bufmgr back to the screen.
...
Mesa requires that we be able to share objects between contexts, which means
that the objects need to be created by the same bufmgr, and the bufmgr
internally requires pthread protection for thread safety.
Rely on the bufmgr having appropriate locking.
2008-09-10 13:59:45 -07:00
Shane Blackett
7b8d878bed
Fixes for Mingw
2008-09-10 08:23:19 -06:00
Brian Paul
86ae34fbb4
mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()
2008-09-05 08:07:07 -06:00
Brian Paul
11d694b1bb
mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()
2008-09-05 08:06:59 -06:00
Brian Paul
9246c2fad4
mesa: replace MALLOC w/ CALLOC to fix valgrind warning
2008-09-05 08:06:24 -06:00
Dave Airlie
06537296f1
intel: only enable occlusion query if the drm has defines.
...
This interface has to be re-written to not be dumb and to work
for multiple apps.
2008-09-05 13:48:51 +10:00
Brian Paul
16f3461fd6
mesa: improved gl_buffer_object reference counting
...
Use new _mesa_reference_buffer_object() function wherever possible.
Fixes buffer object/display list crash reported in ParaView.
2008-09-04 15:26:07 -06:00
Brian Paul
37c74af01c
mesa: improved gl_buffer_object reference counting
...
Use new _mesa_reference_buffer_object() function wherever possible.
Fixes buffer object/display list crash reported in ParaView.
2008-09-04 14:59:40 -06:00
Kristian Høgsberg
4a32f0c638
configure.ac: bump dri2proto requirement, drop TTM_API define.
2008-09-04 06:23:14 -04:00
Xiang, Haihao
0ac8886b51
intel: Fix depth_stencil texture.
...
(cherry picked from commit 0adfd10210
)
2008-09-04 11:54:31 +08:00
Xiang, Haihao
1729d37223
mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24
...
(cherry picked from commit 218df7f9c5
)
2008-09-04 11:54:21 +08:00
Jakob Bornecrantz
81edef6f9f
mesa: Support for MESA_FORMAT_S8_Z24 texture
...
cherry-picked from gallium-0.1
(cherry picked from commit dc44bb8e92
)
2008-09-04 11:54:08 +08:00
Xiang, Haihao
0adfd10210
intel: Fix depth_stencil texture.
2008-09-04 11:36:04 +08:00
Xiang, Haihao
218df7f9c5
mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24
2008-09-04 11:32:52 +08:00
Jakob Bornecrantz
dc44bb8e92
mesa: Support for MESA_FORMAT_S8_Z24 texture
...
cherry-picked from gallium-0.1
2008-09-04 10:35:01 +08:00
Eric Anholt
a04aeea5c0
intel: Fix prototype warning.
2008-09-03 16:13:18 +01:00
Eric Anholt
e32721c46a
intel: Fix refcounting on depth buffer initialization in DRI2.
...
(Reverts a change to work around the problem on 965).
2008-09-03 13:31:44 +01:00
Xiang, Haihao
3bb2a24921
intel: Fix a crash if dri2 is disabled.
2008-09-03 14:47:36 +08:00
Brian Paul
e040e18c7b
fix BUFFER_DEPTH/BUFFER_ACCUM mix-up
2008-09-02 18:13:53 -06:00
Brian Paul
0fd1a8c4a1
fix BUFFER_DEPTH/BUFFER_ACCUM mix-up
2008-09-02 18:10:51 -06:00
Roland Scheidegger
14d186644b
fix no error generated when calling glLight{if}[v] inside begin/end (bug 17408)
2008-09-02 15:49:35 +02:00
Roland Scheidegger
418b603513
fix no error generated when calling glLight{if}[v] inside begin/end (bug 17408)
2008-09-02 15:48:50 +02:00
Michel Dänzer
55270310c5
Fix build by removing #include of removed dri_sarea.h.
...
Thanks to JohnFlux on IRC for pointing out the problem.
2008-09-01 11:43:29 +02:00
Kristian Høgsberg
f56b569e9a
DRI2: Drop sarea, implement swap buffers in the X server.
2008-08-29 12:13:14 -04:00
Xiang, Haihao
e4535e4d5e
i965: force thread switch after IF/ELSE/ENDIF. partial fix for #16882 .
...
A thread switch is implicitly invoked after the issuance of an IF/ELSE/ENDIF
instruction if necessary. Unfortunately it seems sometimes a forced thread
switch is needed.
2008-08-29 10:30:12 +08:00
Xiang, Haihao
a008813890
i965: mask control for BREAK/CONT/DO/WHILE. partial fix fox #16882
2008-08-29 10:30:03 +08:00
Xiang, Haihao
da50dc7bb3
i965: Push/pop instruction state. partial fix for #16882
2008-08-29 10:29:57 +08:00
Xiang, Haihao
7a2ab6d055
i965: force thread switch after IF/ELSE/ENDIF. partial fix for #16882 .
...
A thread switch is implicitly invoked after the issuance of an IF/ELSE/ENDIF
instruction if necessary. Unfortunately it seems sometimes a forced thread
switch is needed.
2008-08-29 09:49:16 +08:00
Xiang, Haihao
6073b49c79
i965: mask control for BREAK/CONT/DO/WHILE. partial fix fox #16882
2008-08-29 09:28:08 +08:00
Xiang, Haihao
fd81433a4e
i965: Push/pop instruction state. partial fix for #16882
2008-08-29 09:23:25 +08:00
Brian Paul
7f628d9cbc
mesa: bump MAX_INSN to 350
2008-08-28 15:16:33 -06:00
Brian Paul
6138ee9de0
mesa: bump MAX_INSN to 350
2008-08-28 15:15:00 -06:00
Julien Cristau
f9affb3059
Prepare changelog for upload
2008-08-27 19:52:30 +02:00
Julien Cristau
fd7cc514d2
Some more parallel build updates.
2008-08-27 19:52:14 +02:00
Julien Cristau
f6a927b45f
Update changelog
2008-08-27 17:29:28 +02:00
Julien Cristau
8772e02b68
Merge tag 'mesa_7_1' into debian-experimental
2008-08-27 17:28:31 +02:00
Brian Paul
b2ffd0be03
placeholder for upcoming 7.2 release notes
2008-08-26 16:24:37 -06:00
Brian Paul
bafefccff8
mesa: don't check for GLSL 1.2 to advertise GL 2.1
...
The GLSL 1.2 features are minor...
2008-08-26 16:13:39 -06:00
Brian Paul
9aeb6e7825
added 7.1 MD5 sums
2008-08-26 16:12:29 -06:00
Brian Paul
912b16c689
added 7.1 MD5 sums
2008-08-26 16:11:56 -06:00
Brian Paul
019b9529e5
change MESA_MINOR to 3
2008-08-26 15:59:06 -06:00
Brian Paul
17e9bbd5a4
7.1 updates from 7.2 branch
2008-08-26 15:58:42 -06:00
Timo Jyrinki
385d6b2e68
asst. html doc updates
2008-08-26 12:36:39 -06:00
Brian Paul
80af50b35b
mesa: glsl: regenerated file
2008-08-25 09:20:26 -06:00
Brian Paul
2d5087bf74
mesa: glsl: grab latest fixes from gallium-0.1 branch
...
Includes:
1. Fixes failed asserting about bad swizzles in src reg emit.
2. Tracks uniform var usage.
3. Emit exp() in terms of EXP2 instruction.
2008-08-25 09:20:00 -06:00
Brian Paul
d6df735f1c
mesa: set version string to 7.3-devel
2008-08-25 09:18:33 -06:00
Julien Cristau
ac8771ee99
Update changelog
2008-08-24 17:38:03 +02:00
Julien Cristau
16358bb3cc
Merge branch 'mesa_7_2_branch' of git.freedesktop.org:/git/mesa/mesa into debian-experimental
2008-08-24 17:34:47 +02:00
Dave Airlie
f75843a517
Revert "Revert "Merge branch 'drm-gem'""
...
This reverts commit 7c81124d7c
.
2008-08-24 17:59:10 +10:00
Julien Cristau
ef160330e5
Merge tag 'mesa_7_1_rc4' into debian-experimental
...
Conflicts:
progs/fp/Makefile
progs/slang/Makefile
progs/tools/trace/gltrace_support.cc
progs/trivial/Makefile
2008-08-16 18:43:53 +02:00
Julien Cristau
332dcfb60b
Add parallel build support.
2008-08-04 12:49:03 +02:00
Julien Cristau
a8dde163dc
Prepare changelog for upload
2008-07-13 19:42:01 +02:00
Julien Cristau
868d0accef
update changelog and patches
...
01_fix-installdir.patch dropped, applied upstream
04_osmesa_version.diff needed fixing
2008-07-13 19:36:56 +02:00
Julien Cristau
64e57ed257
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
...
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
2008-07-13 19:20:03 +02:00
Julien Cristau
e325b76444
Prepare changelog for upload
2008-07-12 18:56:22 +02:00
Julien Cristau
34eedc6a98
update changelog
2008-07-12 18:55:55 +02:00
Julien Cristau
8c21c2e07e
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-unstable
2008-07-12 17:21:50 +02:00
Brian Paul
27425708f5
mesa: return -1, not GL_FALSE if _glapi_add_dispatch() fails name sanity check
2008-07-09 15:06:49 -06:00
Brian Paul
fc07b6cda0
ARB program, GLSL fixes
2008-07-09 08:58:47 -06:00
Brian Paul
562ed27eb5
mesa: remove debug code
2008-07-09 08:52:44 -06:00
Brian Paul
0a0e09078d
mesa: implement glGetUniformiv() with new ctx->Driver function
...
The old implementation could overwrite the caller's param buffer.
cherry-picked from master
2008-07-09 08:51:35 -06:00
Brian Paul
50bc5a75a7
mesa: fix state.clip[n].plane parsing bug (bug 16611)
2008-07-09 08:42:49 -06:00
Brian Paul
6661f53eb3
mesa: check for OpenBSD (bug 15604)
...
cherry-picked from master
2008-07-09 08:42:28 -06:00
Xiang, Haihao
b8782affc8
i915: fall back to software rendering when shadow comparison is
...
enabled for 1D texture. fix #12176
Cherry-picked from commit 75e4db1804
2008-07-09 13:44:13 +08:00
Brian Paul
9a9e839b9b
added null texObj ptr check (bug 15567)
2008-07-08 15:13:23 -06:00
Julien Cristau
b04ccc9a03
Disable the i915tex driver, it doesn't build against libdrm 2.3.1.
2008-07-08 18:18:56 +02:00
Xiang, Haihao
aa522e14ee
i965: official name for GM45 chipset
2008-07-08 14:39:01 +08:00
Julien Cristau
dabd09f5a9
some more debian/rules adjustments
...
build the software libGL with --disable-gl-osmesa, and try to fix some
rules dependencies
2008-07-06 14:03:58 +02:00
Julien Cristau
46ffb3c0b1
debian/rules cleanup and fixes
...
* tell configure which dri drivers we want to build, based on the old
configs/debian-dri-default
* disable direct rendering for the glx libGL on the hurd
* make sure patches are applied before we run autoreconf, and autoreconf
runs before all builds
2008-07-05 14:03:57 +02:00
Julien Cristau
4b9b01f0a5
Use --with-driver=dri for the dri config
...
the default is xlib on some architectures and dri on others, so we
need to set that explicitly
2008-07-05 12:59:14 +02:00
Timo Aaltonen
0261355a03
Fix confflags CFLAGS and clean up confflags-dri.
2008-07-04 11:50:09 +03:00
Timo Aaltonen
beb8547c71
Delete two files not available on the tarball.
...
docs/gears.png
src/glut/os2/src-glut_os2pm.zip
2008-07-04 11:50:08 +03:00
Timo Aaltonen
4aa518a2d7
Add a patch from upstream to set installdir properly.
...
this also replaces 01_fix-libdir.patch and the need to set --libdir for
every target.
2008-07-04 11:50:08 +03:00
root
08af66d57e
Revert "Remove configs/current on clean."
...
This reverts commit 2380f8bd93
.
Conflicts:
debian/changelog
2008-07-04 11:50:08 +03:00
root
38eb154b39
Use --enable-glx-tls for dri.
2008-07-04 11:50:08 +03:00
Timo Aaltonen
2954e4c3d7
Disable glut for swx11 targets.
...
It was not built before either and would need new build-deps (xi xmu).
2008-07-04 11:50:08 +03:00
Julien Cristau
213803b4d4
fix libOSMesa versioning, to revert accidental SONAME bump.
2008-07-03 18:30:35 +02:00
Timo Aaltonen
2380f8bd93
Remove configs/current on clean.
2008-07-03 18:37:28 +03:00
Timo Aaltonen
e846ebc1a1
don't chmod configure which does not exist.
2008-07-03 18:14:25 +03:00
Timo Aaltonen
6dedd60350
Further autoconf changes:
...
add automake & autoconf to build-deps
add some cleanup rules
2008-07-03 15:53:19 +03:00
Timo Aaltonen
063a487fe1
Fix the configure.ac patch somewhat
...
workaround the problems by setting --libdir for all flavours, otherwise
the path used is /usr/usr/lib.
2008-07-03 13:20:21 +03:00
Timo Aaltonen
99a35fd4e1
01_fix-libdir.patch: libdir handling is broken in configure.ac, fix it.
2008-07-03 09:31:23 +03:00
Timo Aaltonen
cbaac82c2c
Further tweaks to the autoconf stuff. Getting closer but still not there
2008-07-03 09:26:46 +03:00
Brian Paul
2c9e332bce
mesa: when linking a shader program, make sure all the shaders compiled OK
...
cherry-picked from master
2008-07-02 17:05:01 -06:00
Brian Paul
e89deed74d
mesa: fix error codes in _mesa_shader_source(), _mesa_get_shader_source()
...
cherry-picked from master
If the 'shader' parameter is wrong, need to either generate GL_INVALID_VALUE
or GL_INVALID_OPERATION. It depends on whether 'shader' actually names a
'program' or is a totally unknown ID.
There might be other cases to fix...
2008-07-02 17:02:41 -06:00
Brian Paul
5cb6f5515f
mesa: regenerated file
2008-07-02 17:02:14 -06:00
Brian Paul
c5024d4a5c
mesa: added some missing equal() notEqual() intrinsics
...
cherry-picked from master
2008-07-02 17:01:26 -06:00
Timo Aaltonen
9d72de1fb2
Run autoreconf before building the various flavours.
2008-07-03 00:20:58 +03:00
Brian Paul
62626467b4
fixes some GLSL bugs
2008-07-02 12:45:16 -06:00
Brian Paul
c55a72ef48
mesa: regenerated files
2008-07-02 12:42:52 -06:00
Brian Paul
8a353c4020
mesa: fix all(bvec2) function typo, add missing bvec2/3/4() constuctors
...
cherry-picked from master
2008-07-02 12:42:12 -06:00
Brian Paul
8261c40bb9
mesa: init default span fog if fragprog uses fog input register
...
See bug #16194 for original patch. Cleaned up a bit here.
2008-07-02 08:58:32 -06:00
Timo Aaltonen
053bf7f5db
rules: Replace the old build system with the new autotools-based system.
2008-07-02 17:56:51 +03:00
Timo Aaltonen
e6a5e6512f
Add gl.pc to libgl1-mesa-dev
2008-07-02 14:07:23 +03:00
Timo Aaltonen
bc32cd7fc8
Add dri_interface.h to mesa-common-dev.
2008-07-01 18:58:17 +03:00
Timo Aaltonen
24fde3cf34
Drop mesa-swx11-source.
2008-07-01 18:56:38 +03:00
Timo Aaltonen
7ceaa0916a
Re-add linux-osmesa-static and linux-osmesa32-static
...
they were dropped by mistake during the merge.
2008-07-01 18:51:01 +03:00
Timo Aaltonen
4c958fbfb4
Build-depend on x11proto-dri2-dev.
2008-07-01 16:24:46 +03:00
Timo Aaltonen
9795ef4348
Refresh patches, and drop obsolete 00_create-libdir.patch and 01_fix-makefile.patch
2008-07-01 16:07:17 +03:00
Julien Cristau
768d8e0563
update changelog and require libdrm 2.3.1
2008-07-01 13:46:54 +02:00
Julien Cristau
374be37dd9
Merge branch 'master' of git.freedesktop.org:/git/mesa/mesa into debian-experimental
...
Conflicts:
.gitignore
Makefile
bin/mklib
configs/.gitignore
configs/default
configs/freebsd
configs/freebsd-dri
configs/linux-osmesa
configs/linux-osmesa16
configs/linux-osmesa16-static
configs/linux-osmesa32
docs/download.html
docs/install.html
docs/news.html
docs/relnotes.html
doxygen/Makefile
doxygen/doxy.bat
doxygen/header.html
doxygen/header_subset.html
include/GL/internal/dri_interface.h
progs/demos/.gitignore
progs/directfb/Makefile
progs/egl/Makefile
progs/fbdev/Makefile
progs/fbdev/glfbdevtest.c
progs/fp/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/bump.c
progs/glsl/mandelbrot.c
progs/glsl/noise.c
progs/glsl/toyball.c
progs/miniglx/Makefile
progs/samples/.gitignore
progs/slang/Makefile
progs/tests/.gitignore
progs/tests/Makefile
progs/tests/arbnpot.c
progs/tests/cva.c
progs/tests/dinoshade.c
progs/tests/drawbuffers.c
progs/tests/fbotest2.c
progs/tests/fbotexture.c
progs/tests/getprocaddress.c
progs/tests/mipmap_limits.c
progs/tests/multipal.c
progs/tests/texline.c
progs/tools/trace/Makefile
progs/trivial/Makefile
progs/trivial/dlist-edgeflag-dangling.c
progs/trivial/dlist-edgeflag.c
progs/trivial/point-param.c
progs/trivial/quad-clip-nearplane.c
progs/trivial/tri.c
progs/vp/Makefile
progs/xdemos/.gitignore
progs/xdemos/Makefile
progs/xdemos/glthreads.c
src/egl/Makefile
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/mesa/Makefile
src/glu/mesa/Makefile.m32
src/glu/mesa/project.c
src/glu/mini/project.c
src/glut/directfb/Makefile
src/glut/directfb/callback.c
src/glut/directfb/events.c
src/glut/directfb/internal.h
src/glut/directfb/window.c
src/glut/os2/Makefile
src/glut/os2/WarpWin.cpp
src/glut/os2/glutOverlay.cpp
src/glut/os2/glut_8x13.cpp
src/glut/os2/glut_9x15.cpp
src/glut/os2/glut_bitmap.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_cmap.cpp
src/glut/os2/glut_cursor.cpp
src/glut/os2/glut_event.cpp
src/glut/os2/glut_ext.cpp
src/glut/os2/glut_fullscrn.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_get.cpp
src/glut/os2/glut_hel10.cpp
src/glut/os2/glut_hel12.cpp
src/glut/os2/glut_hel18.cpp
src/glut/os2/glut_init.cpp
src/glut/os2/glut_input.cpp
src/glut/os2/glut_key.cpp
src/glut/os2/glut_keyctrl.cpp
src/glut/os2/glut_keyup.cpp
src/glut/os2/glut_mesa.cpp
src/glut/os2/glut_modifier.cpp
src/glut/os2/glut_roman.cpp
src/glut/os2/glut_shapes.cpp
src/glut/os2/glut_stroke.cpp
src/glut/os2/glut_swap.cpp
src/glut/os2/glut_teapot.cpp
src/glut/os2/glut_tr24.cpp
src/glut/os2/glut_util.cpp
src/glut/os2/glut_vidresize.cpp
src/glut/os2/glut_warp.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/glutbitmap.h
src/glut/os2/glutstroke.h
src/glut/os2/layerutil.h
src/glut/os2/libGlut.DEF
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/mini/Makefile
src/glx/mini/miniglx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/drivers/allegro/amesa.c
src/mesa/drivers/allegro/direct.h
src/mesa/drivers/allegro/generic.h
src/mesa/drivers/d3d/D3DCAPS.CPP
src/mesa/drivers/d3d/D3DHAL.H
src/mesa/drivers/d3d/D3DInit.cpp
src/mesa/drivers/d3d/D3DMESA.H
src/mesa/drivers/d3d/D3DRaster.cpp
src/mesa/drivers/d3d/D3DTEXT.CPP
src/mesa/drivers/d3d/D3DTextureMgr.cpp
src/mesa/drivers/d3d/D3DTextureMgr.h
src/mesa/drivers/d3d/D3DUTILS.CPP
src/mesa/drivers/d3d/DDrawPROCS.c
src/mesa/drivers/d3d/DEBUG.C
src/mesa/drivers/d3d/DEBUG.H
src/mesa/drivers/d3d/DbgEnv.bat
src/mesa/drivers/d3d/MAKEFILE
src/mesa/drivers/d3d/OPENGL32.DEF
src/mesa/drivers/d3d/WGL.C
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/dri_util.h
src/mesa/drivers/dri/common/xmlconfig.c
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i915/i915_fragprog.c
src/mesa/drivers/dri/i915/i915_program.h
src/mesa/drivers/dri/i915/i915_texprog.c
src/mesa/drivers/dri/i915/i915_texstate.c
src/mesa/drivers/dri/i915/i915_vtbl.c
src/mesa/drivers/dri/i915/intel_context.c
src/mesa/drivers/dri/i915/intel_context.h
src/mesa/drivers/dri/i915/intel_pixel.c
src/mesa/drivers/dri/i915/intel_render.c
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/intel_state.c
src/mesa/drivers/dri/i915/intel_tex.c
src/mesa/drivers/dri/i915/intel_tris.c
src/mesa/drivers/dri/i915tex/i830_reg.h
src/mesa/drivers/dri/i915tex/i830_texstate.c
src/mesa/drivers/dri/i915tex/i830_vtbl.c
src/mesa/drivers/dri/i915tex/i915_fragprog.c
src/mesa/drivers/dri/i915tex/i915_metaops.c
src/mesa/drivers/dri/i915tex/i915_tex_layout.c
src/mesa/drivers/dri/i915tex/i915_texstate.c
src/mesa/drivers/dri/i915tex/i915_vtbl.c
src/mesa/drivers/dri/i915tex/intel_render.c
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_tris.c
src/mesa/drivers/dri/i965/brw_aub.c
src/mesa/drivers/dri/i965/brw_aub_playback.c
src/mesa/drivers/dri/i965/brw_cc.c
src/mesa/drivers/dri/i965/brw_clip.c
src/mesa/drivers/dri/i965/brw_clip_state.c
src/mesa/drivers/dri/i965/brw_clip_util.c
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_curbe.c
src/mesa/drivers/dri/i965/brw_defines.h
src/mesa/drivers/dri/i965/brw_draw.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_eu.h
src/mesa/drivers/dri/i965/brw_eu_emit.c
src/mesa/drivers/dri/i965/brw_gs_state.c
src/mesa/drivers/dri/i965/brw_misc_state.c
src/mesa/drivers/dri/i965/brw_sf_emit.c
src/mesa/drivers/dri/i965/brw_sf_state.c
src/mesa/drivers/dri/i965/brw_state_cache.c
src/mesa/drivers/dri/i965/brw_state_pool.c
src/mesa/drivers/dri/i965/brw_tex.c
src/mesa/drivers/dri/i965/brw_tex_layout.c
src/mesa/drivers/dri/i965/brw_vs_state.c
src/mesa/drivers/dri/i965/brw_vs_tnl.c
src/mesa/drivers/dri/i965/brw_wm.c
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
src/mesa/drivers/dri/i965/brw_wm_state.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/drivers/dri/i965/bufmgr_fake.c
src/mesa/drivers/dri/i965/intel_batchbuffer.c
src/mesa/drivers/dri/i965/intel_batchbuffer.h
src/mesa/drivers/dri/i965/intel_blit.c
src/mesa/drivers/dri/i965/intel_blit.h
src/mesa/drivers/dri/i965/intel_buffers.c
src/mesa/drivers/dri/i965/intel_context.c
src/mesa/drivers/dri/i965/intel_context.h
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
src/mesa/drivers/dri/i965/intel_mipmap_tree.h
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
src/mesa/drivers/dri/i965/intel_pixel_copy.c
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/intel_tex_validate.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/intel/intel_batchbuffer.c
src/mesa/drivers/dri/intel/intel_batchbuffer.h
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_buffers.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_screen.h
src/mesa/drivers/dri/r200/r200_texstate.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_tex.h
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/windows/gdi/wmesa.c
src/mesa/drivers/x11/fakeglx.c
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/context.h
src/mesa/main/dlist.c
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/image.c
src/mesa/main/imports.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/teximage.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/version.h
src/mesa/shader/prog_execute.c
src/mesa/shader/program.c
src/mesa/shader/shader_api.c
src/mesa/shader/slang/library/slang_core.gc
src/mesa/shader/slang/library/slang_core_gc.h
src/mesa/shader/slang/slang_codegen.c
src/mesa/sources
src/mesa/sparc/glapi_sparc.S
src/mesa/swrast/s_aalinetemp.h
src/mesa/swrast/s_aatriangle.c
src/mesa/swrast/s_aatritemp.h
src/mesa/swrast/s_context.c
src/mesa/swrast/s_copypix.c
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_pointtemp.h
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_texfilter.c
src/mesa/swrast/s_tritemp.h
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_draw.c
src/mesa/tnl/t_vb_fog.c
src/mesa/tnl/t_vb_program.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_split_copy.c
src/mesa/x86-64/xform4.S
src/mesa/x86/common_x86.c
src/mesa/x86/glapi_x86.S
windows/VC6/mesa/mesa/mesa.dsp
2008-07-01 13:18:27 +02:00
Xiang, Haihao
9fa552eb0f
dri: Take the base image size into account when computing
...
first level of the mipmap. fix #16421
2008-07-01 11:50:11 +08:00
Brian Paul
5f8ad807be
s/GL_INVALID_VALUE/GL_INVALID_OPERATION/ in _mesa_get_uniformfv()
2008-06-28 16:50:07 -06:00
Zou Nan hai
b6e165d661
optimize 965 clip
...
1. increase clip thread number to 2
2. do cliptest for -rhw
Cherry-picked from commits b47c9f8c91
,
aa88d11e7d
.
2008-06-23 15:16:11 +08:00
Roland Scheidegger
afbb645906
r200: fix typo in r200TryDrawPixels parameter validation (bug 16406)
2008-06-21 02:52:18 +02:00
Brice Goglin
2b831e73f5
Prepare changelog for upload
2008-06-18 20:59:24 +02:00
Brice Goglin
6ec170290c
Put all configs/ changes into the .diff.gz
...
Put back our configs/ changes into the .diff.gz since choose-configs
needs them before quilt is invoked. Put 04_cleanup-osmesa-configs.patch
there as well for #485161 .
2008-06-18 20:59:09 +02:00
Brice Goglin
7c8ea0899a
Revert "Move our configs/ changes from the .diff.gz into our quilt patches"
...
This reverts commit 03970183fc
.
Conflicts:
debian/changelog
2008-06-18 20:55:42 +02:00
Brice Goglin
f81070dbd5
Pull from mesa_7_0_branch
2008-06-18 20:55:00 +02:00
Brice Goglin
955c2ef48f
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
2008-06-18 20:52:25 +02:00
Xiang, Haihao
2ac4919d24
i965: add support for Intel 4 series chipsets
2008-06-18 15:48:45 +08:00
Xiang, Haihao
3ed89025f3
i915: The pitch passed to intelEmitCopyBlitLocked should be in pixels,
...
not in bytes. Reported by Christopher Dissauer.
2008-06-18 13:52:04 +08:00
Xiang, Haihao
5b42bbce70
i915: fix data size in intelTryDrawPixels. Reported by Christopher Dissauer
2008-06-18 13:40:22 +08:00
Brian Paul
d2e0a11aab
mesa: fix inconsistent use of GL_UNSIGNED_INT vs. GL_UNSIGNED_INT_24_8_EXT for Z unpacking
2008-06-17 16:44:00 -06:00
Brice Goglin
5033e5b36d
Prepare changelog for upload
2008-06-17 20:01:01 +02:00
Brice Goglin
6a6a9c1c5a
Pull from mesa_7_0_branch
2008-06-17 20:00:37 +02:00
Brice Goglin
3d6aa2e06f
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
2008-06-17 19:54:47 +02:00
Brice Goglin
03970183fc
Move our configs/ changes from the .diff.gz into our quilt patches
...
with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch
2008-06-17 19:32:21 +02:00
Brian Paul
47d046c93f
mesa: make mm.c use unsigned ints for offsets.
...
If you have a GPU using this code and it has the offsets up in this space,
this fails.
cherry-picked from master
2008-06-17 10:10:53 -06:00
Wilfried Holzke
718724deeb
assorted glide driver fixes/updates
2008-06-17 10:03:03 -06:00
Brian Paul
85c325c36c
add hyphen to rm command
2008-06-17 10:02:10 -06:00
Brian Paul
7e6d99f5ec
glu: silence warnings
2008-06-17 09:01:40 -06:00
Brian Paul
6ce6dc961b
bump version to 7.0.4
2008-06-16 10:19:29 -06:00
Brian Paul
186883611e
fix glPixelZoom stack over flow on Windows
2008-06-16 10:19:28 -06:00
Brian Paul
48b3c59cb9
mesa: allocate pixel zoom arrays on heap, not stack
...
Fixes stack overflow on Windows.
cherry-picked from master
2008-06-16 10:19:28 -06:00
Brian Paul
04b9d5bc23
Fix _mesa_new_program() recursive call regression
...
This was introduced by the "i965 GLSL merge" from master (ce7a9efb09
)
2008-06-16 10:19:28 -06:00
Brian Paul
91707e9020
fix GLSL generic vertex attrib linking bug
2008-06-16 10:19:28 -06:00
Xiang, Haihao
82a0e82232
i965: fix intel_batchbuffer_space. (bug#14709)
2008-06-13 13:53:46 +08:00
Brice Goglin
fe4264bf45
Prepare changelog for upload
2008-06-13 06:53:55 +02:00
Brice Goglin
2fa795a213
Pull from mesa_7_0_branch
2008-06-11 18:59:59 +02:00
Brice Goglin
e32aaf5da8
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
2008-06-11 18:58:59 +02:00
Brian
03447de338
disable ctx->Driver.NewProgram() call in _mesa_new_program()
...
This was causing infinite recursive calls w/ software drivers.
All vertex/fragment shaders should be allocated by calling
ctx->Driver.NewProgram(), not by calling _mesa_new_program().
(Cherry picked from commit 40133487db
,
351a83163a
).
2008-06-11 17:03:47 +08:00
Dave Airlie
ee5f4a4caf
r300: disable the lowimpact fallbacks by default.
...
because really we should be able to just fix the driver.
(cherry picked from commit 7013eecf28
)
There are actually even better reasons for this, the bottom line being that
enabling these fallbacks makes a lot of apps unusable mostly for no gain
whatsoever.
2008-06-11 10:42:16 +02:00
Xiang, Haihao
c04f3933ab
i915: fix fd.o #14966
2008-06-11 11:36:01 +08:00
Xiang, Haihao
8f328c45e5
i915: Keith Whitwell's swizzling TEX patch. fix #8283
...
Cherry picked from commit 3369cd9a6f
2008-06-11 11:32:12 +08:00
Brice Goglin
9676f0cffc
Pull from mesa_7_0_branch
2008-06-10 23:18:28 +02:00
Brice Goglin
2d0ca23319
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
2008-06-10 22:48:43 +02:00
Xiang, Haihao
6f4c8b5b50
i965: apply commit 6c1a98e97a
to glsl
...
(cherry picked from commit a742bed99a
)
2008-06-10 16:46:02 +08:00
Michal Wajdeczko
f8bd9cc30f
Add support for ATI_separate_stencil in display lists.
...
(cherry picked from commit 7f747204ea
)
2008-06-10 16:28:06 +08:00
Michal Wajdeczko
d9f9b1cd0b
[965] Correctly set read mask for OPCODE_SWZ in pass1.
...
While OPCODE_SWZ has usually been optimized away in pass0, it may still
exist if a SWZ with dst saturate was emitted in pass_fp. Fixes an error
in oglconform fpalu.c.
(cherry picked from commit 13a6f73a64
)
2008-06-10 16:21:31 +08:00
Michal Wajdeczko
eca283976b
[965] Avoid emitting dead code for DPx/math instructions.
...
The pass1 optimization stage clears out writemasks and registers, but the
instructions themselves are still being processed at this stage, and could
have resulted in them still being emitted.
(cherry picked from commit c60b5dfde8
)
2008-06-10 16:18:48 +08:00
Michal Wajdeczko
2176259ca6
[965] Improve pinterp performance by delaying reads of just-written regs.
...
(cherry picked from commit bb419970ef
)
2008-06-10 16:18:09 +08:00
Michal Wajdeczko
8fe6fcb900
[965] Fix negating of unsigned value in emit_wpos_xy.
...
(cherry picked from commit 6c1a98e97a
)
2008-06-10 16:16:52 +08:00
Michal Wajdeczko
76d6edcc38
[965] Add MVP code for position invariant vertex programs.
...
This fixes the arbvptorus demo.
(cherry picked from commit 5f10438f2d
)
2008-06-10 16:13:06 +08:00
Michal Wajdeczko
98d6c671f5
[win32] Use native aligned memory allocation functions.
...
(cherry picked from commit 31fe7cf5e3
)
2008-06-10 16:12:18 +08:00
Andrzej Trznadel
f652811df4
[965] Fix fp temp reg release code to not usually release all temps.
...
Also, use wrapped ffs() instead of native.
(cherry picked from commit 3105bc1d88
)
2008-06-10 15:45:11 +08:00
Andrzej Trznadel
e279f4601d
Fix compat implementation of ffs() to return 1-based bit numbers.
...
(cherry picked from commit e9809a36aa
)
2008-06-10 15:44:53 +08:00
Keith Packard
87a30337a1
[i965] short immediate values must be replicated to both halves of the dword
...
The 32-bit immediate value in the i965 instruction word must contain two
copies of any 16-bit constants. brw_imm_uw and brw_imm_w just needed to
copy the value into both halves of the immediate value instruction field.
(cherry picked from commit ca73488f48
)
2008-06-10 15:37:11 +08:00
Eric Anholt
9c2047b275
[965] Don't let the negate flags of src0 affect 1 constants in precalc_dst/lit
...
This patch is a variant of a submission by Michal Wajdeczko to fix
oglconform fpalu failures.
(cherry picked from commit b4cbf6983e
)
2008-06-10 15:32:53 +08:00
Zou Nan hai
1dcb0433a3
[i915] fix fragment.position
2008-06-10 15:28:07 +08:00
Zou Nan hai
5ff27e02b3
[i965] fix wpos height 1 pixel higher
...
(cherry picked from commit b0f681b458
)
2008-06-10 15:25:20 +08:00
Eric Anholt
4beee58e57
[965] Bug #9151 : make fragment.position return window coords not screen coords.
...
(cherry picked from commit 9c8f27ba13
)
2008-06-10 15:22:08 +08:00
Eric Anholt
1f9de20719
[915] Fix COS function using same plan as SIN.
...
The previous COS function failed badly outside of [-pi/2, pi/2].
2008-06-10 14:55:52 +08:00
Eric Anholt
d05a8d9750
[915] Use a quartic term to improve the accuracy of SIN results.
...
This is described in the link in the comment, and is the same technique that
r300 uses.
2008-06-10 14:46:12 +08:00
Eric Anholt
db5f206c00
[915] Fix fp SIN function, and use a quadratic approximation instead of Taylor.
...
The Taylor series notably fails at producing sin(pi) == 0, which leads to
discontinuity every 2*pi. The quadratic gets us sin(pi) == 0 behavior, at the
expense of going from 2.4% THD with working Taylor series to 3.8% THD (easily
seen on comparative graphs of the two). However, our previous implementation
was producing sin(pi) < -1 and worse, so any reasonable approximation is an
improvement. This also fixes the repeating behavior, where the previous
implementation would repeat sin(x) for x>pi as sin(x % pi) and the opposite
for x < -pi.
2008-06-10 14:22:36 +08:00
Eric Anholt
9dface8347
[965] Fix potential segfaults from bad realloc.
...
C has no order of evaluation restrictions on function arguments, so we
attempted to realloc from new-size to new-size.
(cherry picked from commit e747e9a072
)
2008-06-10 13:54:01 +08:00
Eric Anholt
32f4940883
[965] Fix inversion of SLT/SGE results in vertex programs.
...
The WM code had this right, so copy its behavior. This reverts a flipping
of the arguments to SLT in brw_vs_tnl which came in with the GLSL code that
probably occurred to work around the flipped results, and brings the code back
in line with t_vp_build.c.
(cherry picked from commit 9bae03a583
)
2008-06-10 13:44:54 +08:00
Eric Anholt
a7969a9b93
[965] Fix and enable separate stencil.
...
Note that this does not enable GL_EXT_stencil_two_side, because Mesa's computed
_TestTwoSide ends up respecting only STENCIL_TEST_TWO_SIDE_EXT (defaults to
GL_FALSE), even if the application uses only GL 2.0 / ATI entrypoints.
(cherry picked from commit 9136e1f2c8
)
2008-06-10 13:30:25 +08:00
Eric Anholt
ad88130df5
[965] Replace our own depth constants in intel context with GL context ones.
2008-06-10 13:08:09 +08:00
Eric Anholt
d1e71bc08b
[965] Remove dead code in upload_wm_surfaces.
...
(cherry picked from commit 3ecdae82d7
)
2008-06-10 11:19:53 +08:00
Roland Scheidegger
fa58fe247c
i965: fix OPCODE_TEX when additional ops are needed
2008-06-08 14:04:39 +02:00
Brian Paul
4b71478326
Set the attribute as used.
...
Cherry-picked from gallium-0.1
2008-06-04 14:42:55 -06:00
Zou Nan hai
0989471fdb
[i915] GL_DEPTH_TEXTURE_MODE fix
...
Cherry picked from commit 7233eabaf0
with manual changes.
2008-06-04 15:57:37 +08:00
Xiang, Haihao
696140bd1d
i965: handle source depth to render target for glsl,
...
(cherry picked from commit d2540e6d4b
)
2008-06-04 11:54:25 +08:00
Brian
380d15b7fe
replace // comment with /* */ (bug 14916)
...
(cherry picked from commit eecb3ab7c6
)
2008-06-04 11:52:38 +08:00
Xiang, Haihao
41261d64b2
i965: use _Current pointer instead of Current pointer.
...
Cherry picked from commit de1e9880f8
2008-06-04 11:51:19 +08:00
Zou Nan hai
ce7a9efb09
[i965] Add support for GL shading language in I965 driver.
...
Cherry picked from commit 6ef27b88e6
,
d0ebdca4fa
.
2008-06-04 11:47:08 +08:00
Zou Nan hai
8a38ebe328
[i965] This is to fix random crash in some maps of Ut2004 demo.
...
e.g. bridge of fate.
If vs output is big, driver may fall back to use 8 urb entries for vs,
unfortunally, for some unknown reason, if vs is working at 4x2 mode,
8 entries is not enough, may lead to gpu hang.
Cherry picked from commmit c9c64a100d
2008-06-03 11:30:41 +08:00
Zou Nan hai
dcc6671b85
[i915] don't use 4x4 filter for 1D shadowmap
...
Cherry picked from commit d24a5254c2
2008-06-03 11:23:44 +08:00
Zou Nan hai
b53b7581e4
[i965] fix fd.o bug #11471 and #11478
...
1. Follow EXT_texture_rectangle with YCbCr texture
2. swap UV component for MESA_FORMAT_YCBCR
Cherry picked from commit 7676980d38
.
2008-06-03 11:04:10 +08:00
Zou Nan hai
64a4a03c2a
EXT_texture_sRGB support on i965
...
Cherry picked from commit 6bf81a5edf
,
246d1d2522
.
2008-06-03 10:09:33 +08:00
Brian Paul
b878c3f518
i915tex: fix fragment fog swizzle (from master) (bug 16195)
2008-06-02 09:29:22 -06:00
Brian Paul
6164163ca8
glDrawElement + VBO bug fix
2008-06-02 09:28:31 -06:00
Zou Nan hai
e92a53cd92
[i965] flip point sprite
...
Cherry picked from commit 1202c434d9
2008-06-02 17:05:57 +08:00
Zou Nan hai
2467af98b1
ARB sprite point support on i965
...
Cherry picked from commmit 60179434d1
,
505453a04e
with manual changes.
2008-06-02 17:01:31 +08:00
Xiang, Haihao
6f851d8875
_generic_read_RGBA_span_BGRA8888_REV_SSE2: It should adjust the source
...
and target pointers after do the first 2 pixels. fix bug #15850
Cherry-picked from commit 4b7d301c94
2008-06-02 14:28:42 +08:00
Xiang, Haihao
9b99bf89c4
i965: depth offset on glPolygonMode(GL_LINE/GL_POINT)
...
Cherry picked from 184cf464f4
2008-06-02 14:20:23 +08:00
Xiang, Haihao
7346fca083
965: use RGB565 to render a bitmap if Depth is 16
...
Cherry-picked from commit 5982d39799
.
2008-06-02 14:15:24 +08:00
Xiang, Haihao
7facbb69c6
i965: don't swizzle fogcoord if FogOption is FOG_NONE.
...
fix #10788 issue on 965.
Cherry picked from commit 83068115e2
2008-06-02 14:08:26 +08:00
Xiang, Haihao
f59267d650
i915: set fogcoord to (f,0,0,1). fix #10788 issue on 915.
...
Cherry picked from commit 7eef52e975
2008-06-02 14:06:14 +08:00
Xiang, Haihao
71cb014195
mesa: fix a bad cast in put_values_z24.
...
The values passed to put_values_z24 are GLuint,
not GLubyte. fix #13543
Cherry picked from commit cf46aee14a
2008-06-02 13:59:51 +08:00
Xiang, Haihao
6c0f8db9c2
i965: The jump instruction count is added
...
to IP pre-increment, and should point to
the first instruction after the do instruction
of the do-while block of code
Cherry picked from commit 46e03d584a
2008-06-02 13:54:45 +08:00
Xiang, Haihao
49f1e2fc4c
i965: fix an error in brw_vs_tnl.c
...
Update the tnl program if the state of TEXMAT is changed.
2008-06-02 13:46:31 +08:00
Eric Anholt
2d26e19535
[965] Clarify a bit of index buffer upload code.
...
Cherry picked from commit 5a49e84fcd
2008-06-02 13:18:00 +08:00
Xiang, Haihao
5b0c6cd49a
i965: align the address of the first element within
...
the index buffer. (fix#11910)
Cherry picked from ea07a0df9a
2008-06-02 13:16:53 +08:00
Xiang, Haihao
c3ee8e46cc
i965: fix projtex_mask
...
projtex_mask is only an 8bit field, and wm.input_size_masks includes
other attributes' information, therefore right shift is needed.
Cherry picked from 88451b04e9
2008-06-02 13:01:11 +08:00
Xiang, Haihao
46aac24261
i965: fix bad casts in do_blit_bitmap to support WindowPos correctly
...
Cherry picked from commit e66757c8ba
2008-06-02 11:54:35 +08:00
Xiang, Haihao
e1032ce718
i965: fix DEPTH_TEXTURE_MODE
...
Cherry picked from commit 6e620162a1
with
manual changes
2008-06-02 11:52:36 +08:00
Brian Paul
ce636f36f2
Fix segfault in _save_OBE_DrawElements() when using VBO and display list (bug 16156)
...
This was previously fixed in master by commit 982dcb74fd
by Haihao Xiang.
2008-05-30 08:46:51 -06:00
Xiang, Haihao
93f2eec6b3
i965: roland's DXTn format texture patch(bug10347)
...
Cherry picked from commit db928291dc
2008-05-29 15:50:06 +08:00
Eric Anholt
46ef09d787
[965] Replace various alignment code with a shared ALIGN() macro.
...
In the process, fix some alignment issues:
- Scratch space allocation was aligned into units of 1KB, while the allocation
wanted units of bytes, so we never allocated enough space for scratch.
- GRF register count was programmed as ALIGN(val - 1, 16) / 16 instead of
ALIGN(val, 16) / 16 - 1, which overcounted for val != 16n+1.
Cherry picked from commit 77e0523fb7
2008-05-29 15:48:47 +08:00
Xiang, Haihao
7487ec0ff0
i965: align width/height for volume texture
...
Cherry picked from commit 00b86ecf6f
2008-05-29 15:45:12 +08:00
Xiang, Haihao
a25549866f
intel: applying right alignment to compressed texture,
...
which make small textures(4x4,2x2,1x1) work well.
Cherry picked from commit 8ea66fa2ec
2008-05-29 15:43:31 +08:00
Xiang, Haihao
558cc6e38f
i965: set mt->cpp differently with compressed texture
...
Cherry picked from commit 2cafd749b8
2008-05-29 15:40:44 +08:00
Xiang, Haihao
feb1fa1e83
i965: use BRW_TEXCOORDMODE_CLAMP instead of BRW_TEXCOORDMODE_CLAMP_BORDER
...
to implement GL_CLAMP
Cherry picked from commit ab99960858
. fix #16005
2008-05-28 16:29:17 +08:00
Brian Paul
f32462343d
allow GLX_SAMPLES_ARB==0 (bug 16073)
2008-05-27 09:49:44 -06:00
Brian Paul
08ef1b379a
added sampler types to sizeof_glsl_type()
2008-05-27 08:50:15 -06:00
Karl Schultz
1e79831b56
dependency fixes (bug 13544)
2008-05-27 08:50:14 -06:00
Tormod Volden
7a29164f70
dri: vblank_mode warning
...
From what I can see the environment variables LIBGL_THROTTLE_REFRESH
and LIBGL_SYNC_REFRESH were taken out like 3 years ago, but this
warning was never updated.
2008-05-24 18:34:27 +02:00
Brian Paul
f2533e787e
AA tri and glMaterial fixes
2008-05-16 15:35:19 -06:00
Brian Paul
b2ccd5c1ae
fix memory access error in vbo_bind_vertex_list
...
Picked from master (commit 8fc1a6808d
)
2008-05-16 15:35:19 -06:00
Brian Paul
6f63543dd7
fix an attr/src mix-up when setting-up/binding vertex arrays
...
This fixes problems with incorrect material coefficients when glMaterial
is called per-vertex.
2008-05-16 15:35:19 -06:00
Brian Paul
c966f1629b
fix segfault in AA triangle code when using certain shaders
2008-05-16 15:35:19 -06:00
Xiang, Haihao
709f24adbb
intel: Set right cliprects for the current draw region. fix #15057
2008-05-14 15:01:44 +08:00
Brian Paul
52fe7ea3d1
mesa: free shader program data before deleting shader objects.
...
Picked from master.
Fixes mem corruption seen when glean/api2 test exits.
2008-05-07 16:10:32 +01:00
Xiang, Haihao
44f6a6f9c4
i915: Add E7221 variant to i915.
...
Cherry picked from commit 39bcbe0921
2008-05-07 14:09:28 +08:00
Brian Paul
ac88b3dd16
Add support for GL_REPLACE_EXT texture env mode.
...
GL_REPLACE_EXT comes from the ancient GL_EXT_texture extension. Found an old demo that
actually uses it.
The values of the GL_REPLACE and GL_REPLACE_EXT tokens is different, unfortunately.
2008-04-30 16:08:28 -06:00
Brian Paul
27b6fa5615
mesa: adjust glBitmap coords by a small epsilon
...
Fixes problem with bitmaps jumping around by one pixel depending on window
size. The rasterpos is often X.9999 instead of X+1.
Run progs/redbook/drawf and resize window to check.
Cherry picked from gallium-0.1 branch
2008-04-29 18:38:26 -06:00
Brian Paul
68eb76dfb7
Enabled GL_EXT_multi_draw_arrays extension in R200/R300 drivers
2008-04-29 18:38:26 -06:00
Ove Kaaven
392760ee0c
r200: fix state submission issue causing bogus textures (bug 15730)
2008-04-29 22:11:23 +02:00
Michel Dänzer
063b60a51f
Change default of driconf "allow_large_textures" to announce hardware limits.
...
The previous default these days served mostly to cause artifical problems with
GLX compositing managers like compiz (see e.g.
http://bugs.freedesktop.org/show_bug.cgi?id=10501 ).
(cherry picked from commit acba9c1771
)
2008-04-29 19:03:44 +02:00
Brian Paul
7b676192e9
enable GL_EXT_multi_draw_arrays (see bug 15670)
2008-04-24 16:31:28 -06:00
Brian Paul
138e0010eb
added FreeBSD static config
2008-04-23 08:23:18 -06:00
Anatolij Shkodin
36bad2b478
added freebsd-static
2008-04-23 08:23:18 -06:00
Alan Hourihane
f6d6fc603e
revert
2008-04-22 23:08:35 +01:00
Alan Hourihane
5545b46571
small cleanups
2008-04-22 20:29:42 +01:00
Alan Hourihane
06b0a7acce
correct the return value
2008-04-22 20:29:00 +01:00
Alan Hourihane
534f30064d
Fix error string
2008-04-22 20:28:35 +01:00
Brian Paul
6c9e1b2337
fix GL_ARB_texture_rectangle breakage
2008-04-14 13:44:05 -06:00
Brian Paul
62c67576e0
fixed WIN32 compile problem in libGLU
2008-04-14 13:41:17 -06:00
Brian Paul
91d59e4cb9
check for _WIN32 and __WIN32__
2008-04-14 13:40:39 -06:00
Brian Paul
8de268bb3c
add -Wl case (part of prev DragonFly patch)
2008-04-14 12:58:51 -06:00
Brian Paul
4fd7f6047c
define #extension GL_ARB_texture_rectangle
2008-04-14 12:58:51 -06:00
David Flynn
ff3033e190
define #extension GL_ARB_texture_rectangle
2008-04-14 12:58:51 -06:00
Roland Scheidegger
18404076e3
r200: fix XPD vertex program instruction when using temps as inputs
...
due to the two read ports limit into temp memory may need the MAD_2 instruction
for the second instruction of the decomposed XPD.
While here, also try to avoid MAD_2 for MAD if all 3 inputs are temps but the
temps aren't actually distinct.
2008-04-12 02:40:44 +02:00
Brice Goglin
59c9c40c01
Prepare changelog for upload
2008-04-11 08:42:55 +02:00
Brice Goglin
666e0635da
New upstream release
2008-04-11 08:41:32 +02:00
Brice Goglin
f9968a0346
Merge tag 'mesa_7_0_3' into debian-unstable
2008-04-11 08:38:26 +02:00
Hasso Tepper
39dca05d1d
New dragonfly configs
...
A re-do commit, this time with the intended commit message.
2008-04-09 19:05:59 -06:00
Brian Paul
f51b76b670
Revert "Hasso Tepper <hasso@estpak.ee>"
...
This reverts commit 40ee989db5
.
2008-04-09 19:04:36 -06:00
Brian Paul
40ee989db5
Hasso Tepper <hasso@estpak.ee>
2008-04-09 19:02:41 -06:00
Brian Paul
ef76dfc7a0
add link to 7.0.4 relnotes
2008-04-09 19:01:07 -06:00
Brian Paul
02ddc08353
initial 7.0.4 relnotes
2008-04-09 19:00:53 -06:00
Hasso Tepper
4b24d5261a
patches for DragonFly OS
2008-04-09 18:59:19 -06:00
Brian
4b96a39c48
added MD5 sums for 7.0.3
2008-04-04 19:24:32 -06:00
Brian
48616e71d2
final prep/changes for 7.0.3 release
2008-04-04 19:06:30 -06:00
Brian
70d227ac62
7.0.3 release candidate 3
2008-04-01 18:04:13 -06:00
Eric Anholt
7f2c4f96f5
Bug #13492 : Only call ProgramStringNotify if program parsing succeeded.
...
Wine intentionally tries some out-of-spec programs to test strictness, and
calling ProgramStringNotify on the results of a failed program parse resulted
in crashes in the 965 driver.
(cherry picked from commit 185320ae13
)
2008-04-01 16:27:48 -07:00
Roland Scheidegger
667f0f60fc
fix mistakenly set ATIFragmentShader._Enabled bit (bug 15269)
2008-04-01 23:25:04 +02:00
Brian
7592b8cc10
added some missing calls to _mesa_enable_x_y_extensions()
2008-04-01 08:41:24 -06:00
Brian
f55b831859
fix ARB f/v program comment parsing bug
2008-03-31 15:00:18 -06:00
Markus Amsler
217f7f7e5d
fix parsing bug involving comments at the end of ARB v/f programs
2008-03-31 15:00:18 -06:00
Julien Cristau
2e5a63f365
Prepare changelog for upload
2008-03-31 16:47:34 +02:00
Julien Cristau
7c614b4666
Fix libgl1-mesa-swx11-i686's dependencies
...
Change libgl1-mesa-swx11-i686's pre-dependency on libgl1-mesa-swx11 to a
regular versioned dependency, and add ${shlibs:Depends}.
I'm not sure why this used Pre-Depends in the first place, I don't think
that's needed.
2008-03-31 16:47:17 +02:00
Julien Cristau
b23d908829
Update 02_use-ieee-fp-on-s390-and-m68k.patch.
2008-03-31 13:17:24 +02:00
Julien Cristau
5379b84e63
Update changelog and add bug closer
2008-03-31 13:11:59 +02:00
Julien Cristau
32c913308e
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
2008-03-31 13:00:20 +02:00
Xiang, Haihao
1e83d70b6d
i965: Apply -ve rhw to 965. Fix the regression introduced by
...
commit da476ff02d
. (bug#14940)
2008-03-31 09:37:55 +08:00
Brian
767dfa5b9c
fix texture/renderbuffer mix-up in test_attachment_completeness()
2008-03-28 13:25:25 -06:00
Alan Hourihane
7ff5b38126
Fix build problems
2008-03-27 16:36:12 +00:00
Brian
e209f5300d
updated glext.h to version 40
2008-03-25 08:11:47 -06:00
Brian
3c4b50c352
updated to version 40
2008-03-25 08:11:36 -06:00
Brian
4e7c2fcf18
add GL_READ_FRAMEBUFFER_BINDING_EXT case, regenerate get.c file
2008-03-24 19:55:46 -06:00
Brian
22534f94f5
fix wrong values for GL_READ/DRAW_FRAMEBUFFER_BINDING_EXT tokens
2008-03-24 19:55:04 -06:00
Brian
1a6928fdbe
use ctx->Driver.DeleteProgram() in a few more places
2008-03-22 10:27:08 -06:00
Brian
325dbbac47
delete default programs with ctx->Driver.DeleteProgram()
2008-03-22 09:11:35 -06:00
Brian
39ac6b0481
Fix some PBO breakage.
...
In _mesa_Bitmap, can't early return if bitmap ptr is NULL, it may be an offset
into a PBO. Similarly for _mesa_GetTexImage.
2008-03-21 12:32:29 -06:00
Brian
46cc4854e9
fix IEEE_ONE definition for ICC compiler (bug 15134)
2008-03-19 17:25:18 -06:00
Alan Hourihane
f93882512e
set outputs_safe to 0 as it's possible for the code generation
...
to slip over the allocated memory for the vb.
pull in sse fixes from gallium-0.1
2008-03-19 01:03:48 +00:00
Markus Amsler
0dee2a4f6f
only set InputsRead bit if input is really used
2008-03-17 08:35:34 -06:00
Brian
3cebc35669
init tmpNode to zeros
2008-03-14 14:16:00 -06:00
Brian Paul
e75a204fb9
mesa: fix emit_clamp() so that we don't use an output register as temporary
...
IR_CLAMP is decomposed into OPCODE_MIN+OPCODE_MAX. Allocate a temporary
register for the intermediate value so we don't inadvertantly use an output
register (which are write-only on some GPUs).
2008-03-14 13:57:53 -06:00
Roland Scheidegger
ac06a5c16a
fix state.lightprod ambient/specular w value (bug #14983 )
2008-03-13 12:43:53 +01:00
Dan Nicholson
ed758fee0c
Merge branch '7.0-glx' into mesa_7_0_branch
2008-03-10 16:45:49 -07:00
Jeremy Huddleston
a21c61ee8b
Darwin: Fixed small error in darwin config files
2008-03-10 16:02:55 -07:00
Dan Nicholson
24697da20e
glapi: Resync generated files with 7.0 branch
...
The previous commits pulled in the generated files from master. This
regenerates the files from the source on the 7.0 branch.
2008-03-10 15:17:59 -07:00
Jeremy Huddleston
7120c0089d
Darwin: Config/source fixes to now build glxdemo apps and OSMesa
...
Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config
2008-03-10 15:13:44 -07:00
Dan Nicholson
88a436a8f7
glapi: Generate xserver glapi sources in the mesa tree
...
Instead of generating the glapi sources for the xserver and commiting
them to the xserver tree, we can keep them in the mesa tree and change
the xserver build to use the files from the mesa tree.
This makes the xserver glx build more robust as it reduces the chances
for mismatches of the glX API used in the xserver vs. in mesa.
(cherry picked from commit 7688791fc5
)
2008-03-10 15:03:13 -07:00
Dan Nicholson
2fdb5a245d
glapi: Correct prerequisites for gl_and_glX_API.xml
...
The indirect_dispatch.h and indirect_table.c source files use
gl_and_glX_API.xml in their generation rather than glX_API.xml, but it
wasn't listed in their prerequisites. In turn, gl_and_glX_API.xml uses
glX_API.xml, but this is already listed in $(COMMON_GLX).
(cherry picked from commit 929b6d2ebf
)
2008-03-10 15:03:01 -07:00
Dan Nicholson
8441b53538
glapi: Use make automatic variables to clean up the commands
...
Make use of the make automatic variables $@ (the target) and $< (first
prerequisite) to clean up the commands for the glapi generation. This
improves readability and guards against typos since words are repeated
less frequently.
(cherry picked from commit fc67d47708
)
2008-03-10 15:02:51 -07:00
Dan Nicholson
d336df8b73
glapi: Use variable for indent and flags
...
Put the path to indent and the flags to call it with in configs/default
rather than in the Makefile. This makes it easier to change the values
globally.
(cherry picked from commit 817af9bec2
)
2008-03-10 15:02:36 -07:00
Brian
8aaf805b8a
fix parsing of state.texenv.color (bug 14931)
2008-03-10 07:41:31 -06:00
Markus Amsler
8161fd2785
Set normalized flag for GLubyte arrays in _mesa_VertexAttribPointerNV()
2008-03-09 17:53:00 -06:00
Markus Amsler
2f23025dfe
init vertex weight attrib to (1,0,0,0)
2008-03-09 17:51:21 -06:00
Brian
1867eac230
fix __builtin_expect() definition test for IBM XLC (sf bug 1909832)
2008-03-09 10:54:50 -06:00
Roland Scheidegger
096e35d05f
state.depth.range alpha value should be 1, not 0 (bug #14733 )
2008-03-01 02:57:01 +01:00
Xiang, Haihao
8998f52b97
Don't Swap buffer if a DRIDrawable is entirely obscured by another window.
2008-02-28 11:43:54 +01:00
Brian
0fd38dcc83
Replace glut_fbc.c with glut_fcb.c (cb=callback)
2008-02-25 10:57:54 -07:00
Julien Cristau
d89cf0649e
Add bug closer for #408679 .
2008-02-24 10:23:17 +01:00
Julien Cristau
31e9d9d4f8
Prepare changelog for upload.
2008-02-23 18:18:42 +01:00
Julien Cristau
ea9c6d3d9e
03_optional-progs-and-install.patch: partly applied upstream, fixed up
2008-02-23 16:08:53 +01:00
Brian
ff63cf8068
bump libGL.so version number
2008-02-22 07:59:39 -07:00
Julien Cristau
eaac94c35a
Update changelog.
2008-02-22 12:16:27 +01:00
Julien Cristau
9291506af0
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
...
Conflicts:
src/glx/mini/Makefile
2008-02-22 12:09:35 +01:00
Brian
4716670de9
prep for 7.0.3 rc-2
2008-02-21 16:59:20 -07:00
Brian
33c5b38034
latest bug fixes
2008-02-20 09:39:59 -07:00
Brian
5737d6c565
Fix point rasterization regression caused by commit 95a2eb9767
...
Even-sized, non-AA points need 0.5 bias in position to hit the right pixels.
Test program from bug report 11016 retested and is OK.
2008-02-20 09:38:16 -07:00
Brian
08a7f56c6a
raise GL_INVALID_OPERATION if glProgramString compilation fails
...
cherry picked from master.
2008-02-20 09:00:49 -07:00
Brian
7916f2b4aa
Fix glBegin-time test for invalid programs/shaders.
...
Cherry picked from master.
2008-02-20 08:56:20 -07:00
Brian
193d303ac7
Added <size name="Get" mode="get"/> lines for point parameter tokens.
...
Cherry picked from master
2008-02-19 08:46:39 -07:00
Jeremy Huddleston
e70609b7b8
Apple: Pulled in changes from Apple's patchset to allow mesa to build on darwin again
2008-02-19 00:54:35 -08:00
Xiang, Haihao
da476ff02d
i965: new integrated graphics chipset support
2008-02-19 15:59:50 +08:00
Brian
77e3b5d28b
Fix potential glDrawPixels(GL_DEPTH_COMPONENT) crashes (bug 13915)
...
Also, general clean-up of the Xlib-optimized glDraw/CopyPixels code.
2008-02-16 09:56:26 -07:00
Brian
bf97ca448c
Fix glBindTexture crash (bug 14514)
2008-02-15 13:42:19 -07:00
Roland Scheidegger
c5f8ff8b32
fix bug with generated fragment programs if vertex shader is active
...
When generating a fragment program from fixed function, checking
texUnit->_ReallyEnabled is not sufficient, need texUnit->Enabled too
since the former also represents texture enables from an active vertex
shader.
2008-02-15 17:26:58 +01:00
caner
50465766d1
miniglx doc updates
2008-02-14 09:34:08 -07:00
Xiang, Haihao
7d8df58a63
_mesa_swizzle_ubyt_image: Don't use single swizzle_copy call
...
if components don't match. fix #13508
2008-02-13 07:07:47 -07:00
Andy Skinner
762c074012
added -altopts to allow overriding all other opts
2008-02-07 13:19:55 -07:00
Brian
51f2ee3bfb
fix bug 9871
2008-02-06 07:55:26 -07:00
Brian
b5cd34aa21
Fix bug 9871: enable user-defined clip planes for R300
...
Patch provided by Erkin Bahceci <erkinbah@gmail.com >
2008-02-06 07:54:24 -07:00
Tony DeFeo
ae5c6dcd42
[965] Fix memory leak when deleting buffers with backing store.
2008-02-05 10:49:44 -08:00
Roland Scheidegger
97196d0c8c
regenerate glsl library functions
2008-01-31 01:36:23 +01:00
Roland Scheidegger
f6de56b88a
fix w component of glsl vec4 asin
2008-01-31 01:35:52 +01:00
Brian
d64ea43b76
fix bugs 13507, 14293
2008-01-30 08:12:06 -07:00
Brian
2deaf93d24
check if fb->Delete is null (bugs 13507,14293)
2008-01-30 08:12:06 -07:00
Alex Deucher
a107ec8300
Add new RV380 pci id
...
bug 14289
(cherry picked from commit 80efe27560
)
2008-01-29 10:15:32 -05:00
Alex Deucher
120a1f9508
Merge branch 'mesa_7_0_branch' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
2008-01-29 09:50:26 -05:00
Alex Deucher
bb84007a57
R300: RV410 SE chips have half the pipes of regular RV410
...
This fixes 3D rendering on x700 SE chips. Reported
by Kano.
(cherry picked from commit 0b7e0f8159
)
2008-01-29 09:46:48 -05:00
Alan Hourihane
86234e55a6
pull some more fixes for pbo access from trunk
2008-01-28 11:23:53 +00:00
Alan Hourihane
61972077cd
fix some pbo path problems
2008-01-28 11:15:53 +00:00
Xiang, Haihao
5a7feb8ea2
i965: valid message length includes message header.
2008-01-25 17:23:55 +08:00
Xiang, Haihao
4b4c131cd0
i965: re-define the type of reg.loopcount.
...
avoid some issues such that 1 + (-2) gets a big
positive value.
2008-01-25 17:23:15 +08:00
Julien Cristau
67617c8f89
Drop -O0 workaround on hppa.
...
Stop building with -O0 on hppa. Bug #451047 should be fixed in recent gcc
versions.
2008-01-24 22:52:48 +01:00
Brian
0fd23f01c6
Assorted patches for miniglx/linux-solo (Gavin Li <codeview@gmail.com>)
2008-01-23 16:04:02 -07:00
Adam Jackson
557b0d9df7
glxinfo: Fix multisample visual reporting.
...
strstr() == 0 tests for the string _not_ being present. Originally
Red Hat bug #351871 .
2008-01-22 14:04:39 -07:00
Brian
888f4380cf
fix GLX vertex array bug 14197
2008-01-22 08:41:22 -07:00
Brian
3266c5e95a
fix pc vs. gc->ps usage (bug 14197)
2008-01-22 08:38:48 -07:00
Brian
834decdaae
Don't build yuvrect_client by default
...
Added 'extra' rule to build optional yuvrect_client, shape, xdemo programs
2008-01-22 07:56:31 -07:00
Brian
18b2d83173
remove unused var
2008-01-22 07:54:37 -07:00
Alexey Sokolov
30c65c3c62
define M_PI if needed
2008-01-22 07:42:40 -07:00
Brian
04fcc4cf1e
prep for 7.0.3 release
2008-01-21 16:21:39 -07:00
Julien Cristau
09504dde1f
Update changelog; add Vcs-* and Homepage fields in debian/control.
2008-01-17 22:26:48 +01:00
Julien Cristau
c04885f072
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-unstable
...
Conflicts:
progs/tests/.gitignore
progs/tests/Makefile
2008-01-14 22:30:03 +01:00
Michel Dänzer
48ae5cf09d
i965: Fix byte vs. pixel unit mixup for aligned texture pitch.
...
I sincerely hope I don't manage to mess this up yet again...
Thanks again to Todd Merrill for pointing out the problem and testing the fix
on IRC.
2008-01-14 16:30:58 +01:00
Michel Dänzer
45cdb6eb45
i965: Fix unresolved symbol intel_miptree_pitch_align.
...
For some reason, I thought that function was shared with i915tex... The good
news is that i965 gets to keep the lower pitch alignment requirements.
Thanks to Todd Merrill for pointing out the problem on IRC.
2008-01-11 16:32:39 +01:00
Keith Packard
b9f3f732aa
i915tex: Centralize mipmap pitch computations.
...
mipmap pitches must account for the device alignment requirements, which
used to be fairly simple; just align to a 4-byte boundary. However, to allow
textures to be drawn to under TTM, they now need to be aligned to a 64-byte
boundary. Placing all of the alignment constraints in a single function
allows this new constraint to be applied uniformly.
There was some pitch constraining code in intel_miptree_create, but that was
modifying the pitch long after the miptree had been layed out, so it only
served to wreck the mipmap and cause rendering errors.
(cherry picked from commit a183efc132
with manual
changes for mesa_7_0_branch by Michel Dänzer. One side effect of this is that
i965 also aligns the pitch of 2D textures to multiples of 64 bytes, hopefully
that won't cause any issues)
2008-01-08 16:48:13 +01:00
Brian
17006ddd6b
fix 3d proxy texture depth bug
2008-01-05 15:44:51 -07:00
Brian
b77a354df3
fix depth/1 typo in glTexImage3D proxy code
2008-01-05 15:44:51 -07:00
Brian
71d46beebf
additional stub functions
2008-01-02 07:23:41 -07:00
Brian
454e296eb1
additional GL_COLOR_ATTACHMENTx_EXT cases (bug 13767)
2008-01-02 07:20:08 -07:00
Brian
f9b696be2b
fix vbo display list memleak upon context destruction
2008-01-01 10:23:56 -07:00
Brian
c923edbc71
additional GL_COLOR_ATTACHMENTx_EXT cases (bug 13767)
2008-01-01 10:10:18 -07:00
Brian
e20c1d987f
fix GLSL uniform/attrib bugs (13753)
2008-01-01 09:59:51 -07:00
Bruce Merry
cd354eb10f
Convert to 0/1 when setting boolean uniforms
...
Also add some extra tests to the shader_api regression tests
2008-01-01 09:59:51 -07:00
Bruce Merry
e9ac27ee23
Make use of count in _mesa_uniform_matrix
2008-01-01 09:59:50 -07:00
Bruce Merry
3f9dc9f5b6
Add a test program to test for assorted bugs in shader_api.c
2008-01-01 09:59:50 -07:00
Bruce Merry
ba709875ae
More fixes to shader_api
...
- return GL_INVALID_OPERATION instead of GL_INVALID_VALUE if location is bad
- correct the type-checking of uniforms from my previous commit
- accept location of -1 in _mesa_uniform_matrix
2008-01-01 09:59:50 -07:00
Bruce Merry
80f8397b35
Fix several bugs relating to uniforms and attributes in GLSL API
...
- fix sizes for GL_FLOAT_MAT2x3 and GL_FLOAT_MAT4x3 in sizeof_glsl_type
- fix size returns in _mesa_get_active_attrib
- fix out-of-bounds array access to vec_types in _mesa_get_active_attrib
- fix queries of matrix uniforms in _mesa_get_uniformfv
- fix _mesa_get_uniformfv to only return one base, even from an array
- allow location == -1 in _mesa_uniform
- validate types in _mesa_uniform
- allow array overruns in _mesa_uniform
2008-01-01 09:59:50 -07:00
Brian
b45fa27fa1
added 'get' info for framebuffer object tokens
2008-01-01 09:26:30 -07:00
Brian
b59480645d
add 'Get' info for MAX_3D_TEXTURE_SIZE (for bug 13811)
2008-01-01 09:04:13 -07:00
Brian
148cb36979
add missing double quote (bug 13878)
2008-01-01 07:59:58 -07:00
Roland Scheidegger
c1eb78f7ff
fix GL_LINE_LOOP with drivers using own render pipeline stage ( #12410 , #13527 )
...
primitive needs to include the begin/end flags (broken since vbo-0.2). Should
fix missing first/last line segment on gamma, i810, i915, mga, r200, radeon,
s3v, savage, unichrome (r300 already correct). Tested on r200, fixes #13527 .
2007-12-22 18:49:42 +01:00
Brian
8aa0fd6b20
glGetActiveUniform fix
2007-12-20 09:08:12 -07:00
Brian
a1b3a908f5
return correct size from glGetActiveUniform (bug 13751)
2007-12-20 09:08:12 -07:00
Xiang, Haihao
f9e70d951a
i965: allocate GRF registers before building subroutines,
...
it ensures there are sufficient registers for all subroutines.
2007-12-19 10:44:00 +08:00
Xiang, Haihao
41ed6be1da
i965: restore the flag after building the subroutine of the
...
GS thread. fix #13240
2007-12-19 10:36:56 +08:00
Brian
27de28fc3e
Remove -I$(TOP)/src/mesa/transform
2007-12-18 17:07:11 -07:00
Brian
dd2f01c229
simplify update two-side lighting test (follow-on to previous front/back-face changes)
2007-12-18 16:28:36 -07:00
Brian
deb5c56c77
fix NEED_SECONDARY_COLOR for vert/frag progs
2007-12-18 16:28:36 -07:00
Julien Cristau
9fd22f0e3f
Prepare changelog for upload.
2007-12-18 19:13:27 +01:00
Julien Cristau
942372dcdf
debian/control fixups
...
* Bump Standards-Version to 3.7.3.
* Move libgl1-mesa-swx11-dbg, mesa-common-dev and libosmesa6-dev to section
libdevel.
* libgl1-mesa-swx11 conflicts with libgl1-mesa-glx. Move it and
libgl1-mesa-swx11-dev to priority extra.
* Fix typo in mesa-common-dev's long description.
2007-12-18 13:57:06 +01:00
Julien Cristau
b7f901088b
Update changelog.
2007-12-18 13:32:01 +01:00
Julien Cristau
c02990525c
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
...
Conflicts:
progs/trivial/quad-clip-nearplane.c
2007-12-18 12:28:29 +01:00
Michel Dänzer
0107acded0
i915tex: Fix issues with glDrawBuffer(GL_NONE).
...
Don't dereference NULL renderbuffer pointer, and make sure the software
fallback sticks.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=13694 .
2007-12-17 12:32:26 +01:00
Brian
2ac5e08d1d
fix polygon cull regression
2007-12-14 14:36:23 -07:00
Dan Nicholson
1837b8c214
configs: Fix linking with static libGL and --as-needed
...
Linking of the programs breaks when using a static libGL and the GNU ld
option --as-needed. This is because libXext is needed for the XShm
functions.
(cherry picked from commit 6aaf9bdd41
)
2007-12-07 11:51:18 -08:00
Brian
03d2bc1774
fix gl_FrontFacing
2007-12-04 14:07:15 -07:00
Brian
385bddbde0
fix span->facing computation and gl_FrontFacing initialization
2007-12-04 14:07:15 -07:00
Brian
c135426267
Fix gl_FrontFacing compilation problem
2007-12-04 14:07:15 -07:00
Michel Dänzer
4be0c98120
Use -Bsymbolic for linking all shared objects.
...
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10132 .
Also remove comment about SONAME, as SONAME only applies to shared libraries.
(cherry picked from commit fc7ddea853
)
2007-12-04 18:33:07 +01:00
Brian
e760aebd5a
fix two-side lighting bug/crash
2007-12-03 14:13:08 -07:00
Brian
1f6e7d9c29
fix DD_TRI_LIGHT_TWOSIDE bug ( #13368 )
2007-12-03 14:12:34 -07:00
Dan Nicholson
c6d421af05
Fix the library name in glw.pc
...
Fix a copy and paste error s/GLU/GLw/ in glw.pc.
(cherry picked from commit 2dc85e8078
)
2007-12-03 12:08:03 -08:00
Brian
952df5e493
fix two-sided stencil
2007-12-03 12:00:21 -07:00
Brian
45acb8b058
added missing quote char
2007-12-03 12:00:21 -07:00
Michel Dänzer
e8997c0183
i915tex: Fix up state changes for i8xx.
...
(cherry picked from commit 2af613e0b8
)
2007-12-03 09:38:13 +01:00
Brian
169e62f563
fix-build: remove ctx->_Facing assignment
2007-11-30 15:52:41 -07:00
Brian
1b43babfb1
fix broken two-sided stencil
2007-11-30 13:01:42 -07:00
Brian
43e902f774
better front-plane clip test
2007-11-30 09:09:12 -07:00
Xiang, Haihao
b0a800e249
i965: use uncompressed instruction to ensure only
...
Pixel Mask Copy is modified as the pixel shader thread
turns off pixels based on kill instructions.
2007-11-30 12:36:07 +08:00
Brian
73d5f232ad
New ctx->Driver.Map/UnmapTexture() functions for accessing textures from t_vb_program.c
2007-11-29 08:18:11 -07:00
Brian
f7209541e4
cleanups, comments
...
Conflicts:
src/mesa/tnl/t_vb_program.c
2007-11-29 08:18:11 -07:00
Brian
397a32dca7
Move _mesa_load_tracked_matrices() from TNL module to prog_statevars.c
2007-11-29 08:18:11 -07:00
Roland Scheidegger
e0719d7122
make sure state token values are fully initialized
2007-11-29 03:08:48 +01:00
Michel Dänzer
3f18c0a9f2
r200: Fix texture format regression on big endian systems.
...
See https://bugs.freedesktop.org/show_bug.cgi?id=13324 .
Also use tx_table_be for VALID_FORMAT, in case r200SetTexImages ever gets
called for MESA_FORMAT_RGB888.
(cherry picked from commit dc88a96631
)
2007-11-28 10:25:01 +01:00
Delle
b14be61938
use DEFAULT_SOFTWARE_DEPTH_BITS
2007-11-27 18:18:48 -07:00
Brian
440d620308
minor additions to avoid FAQs
2007-11-27 10:32:39 -07:00
Brian
8dd9df0f3e
document GLSL float f/F suffix bug
2007-11-27 10:32:39 -07:00
Brian
6b9534eaf5
set fp->UsesKill when emitting OPCODE_KIL
2007-11-27 10:32:39 -07:00
Brian
c91d374ad7
improve 24-bit Z to 32-bit Z conversion
2007-11-27 10:32:39 -07:00
Keith Whitwell
1cab4160bc
i915tex: Fix some minor batchbuffer errors.
2007-11-26 17:12:15 +01:00
Keith Whitwell
718d2dfbbd
i915tex: Catch cases where not all state is emitted for a new batchbuffer.
...
This could lead to incorrect rendering or even lockups.
2007-11-26 17:10:26 +01:00
Michel Dänzer
0967e1270d
i915tex: Some additional blit fixes and assertions.
2007-11-26 16:59:41 +01:00
Michel Dänzer
a08c02f1a8
i915tex: Actually wait for previous commands to complete for glFinish().
2007-11-26 16:59:00 +01:00
Brian
bdfd9afead
Consolidate texture fetch code and use partial derivatives when possible.
2007-11-23 12:01:39 -07:00
Brian
1c91a590d6
fix a few GLSL bugs
2007-11-23 10:28:33 -07:00
Brian
65bd7968bf
Fix parsing of gl_FrontLightModelProduct.sceneColor, don't segfault on variable
...
array indexes.
2007-11-23 10:26:02 -07:00
Brian
6ccd23b87b
need to check border width in sample_linear_2d() - fixes failed assertion in texwrap.c test
2007-11-23 09:14:27 -07:00
Brian
823409b7d0
Bump version numbers to 7.0.3 for next release
2007-11-22 09:36:35 -07:00
Brian
c85d31f4a0
Recompute ctx->Point._Size if GL_POINT_SIZE_MIN/MAX changes.
...
Note that all the point size clamping stuff has been redone in Mesa/master.
2007-11-22 09:36:35 -07:00
Roland Scheidegger
24af5c44da
fix z buffer read/write issue with rv100-like chips and old ddx
2007-11-22 02:55:25 +01:00
Brian
75efacf8eb
Initial 7.0.3 relnotes
2007-11-20 08:16:25 -07:00
Brian
825e810247
bring over Fortran fixes from master
2007-11-20 08:15:19 -07:00
Brian
e20723cfc1
Obsolete
2007-11-20 08:13:14 -07:00
Brian
9f39a67c1d
Rename glut_fbc.c -> glut_fcb.c (cb=callback)
2007-11-20 08:13:03 -07:00
Brian
2044f3f791
clamp lambda to Min/MaxLod
2007-11-19 13:05:10 -07:00
Brian
30d4e8c422
fix some texture format assertions, etc
2007-11-19 10:37:41 -07:00
Brian
92d552f6a2
fix out-of-bounds array index (ix=-1)
2007-11-19 09:54:41 -07:00
Brian
5adfcbbc4f
added gl_dispatch_stub_772()
2007-11-16 10:03:57 -07:00
Roland Scheidegger
69969b3819
fix position invariant vertex programs for sw-tnl
...
do the same math as for fixed function pipe, including
user clip planes.
(mostly resurrected from the dead t_vb_arbprogram.c code)
2007-11-15 02:06:15 +01:00
Roland Scheidegger
edfee04fcb
fix bogus assumption if ddx has set up surface reg for z buffer
...
this is wrong since even if ddx has not set up a surface reg to cover the z
buffer we should pretend it has on those rv100 chips since they presumably do
not do z buffer tiling if not using hyperz, so we can use linear addressing
just the same. Doesn't seem to fix #13080 , but it's wrong anyway and the bug
almost certainly broke newer non-tcl chips.
2007-11-15 01:16:27 +01:00
Brice Goglin
ae0bf74db9
Prepare changelog for upload
2007-11-13 21:44:00 +01:00
Julien Cristau
1bf7ce97c0
* Add build-dep on libxext-dev. Thanks, Timo Aaltonen!
2007-11-13 21:40:49 +01:00
Julien Cristau
4971a009e0
* Workaround gcc ICE on hppa: build libOSMesa with -O0 (see bug#451047).
2007-11-13 20:59:08 +01:00
Julien Cristau
e1613ab80d
Don't set -fno-strict-aliasing in configs/debian-default.
...
Upstream uses that since 7.0.2.
2007-11-13 20:57:58 +01:00
Brian
28c9930888
add pointer to Gallium3D info
2007-11-13 09:51:14 -07:00
Brian
e3a35a123e
DRI memory manager info (fixes dangling link)
2007-11-13 09:50:42 -07:00
Brian
412168f2e8
remove dependency on libGLU
2007-11-12 08:21:21 -07:00
Brian
fc0fa0d636
add glw.pc.in to tarball list, remove from DEPEND_FILES
2007-11-12 07:52:20 -07:00
Brice Goglin
caf283329b
Prepare changelog for upload
2007-11-11 11:55:05 +01:00
Brice Goglin
5cedd4a43e
Remove DESTDIR from INSTALL_DIR in configs/debian-default
...
... and update 03_optional-progs-and-install.patch accordingly.
2007-11-11 11:49:16 +01:00
Brice Goglin
0595d32d8a
Refresh 03_optional-progs-and-install.patch
...
The default Makefile requires libGLU to be built
while linking progs/xdemos. However, we don't build
libGLU and progs/xdemos at the same time, and
these progs don't actually need libGLU.
2007-11-11 11:48:32 +01:00
Brice Goglin
e339b4e8da
New upstream release
2007-11-11 00:34:46 +01:00
Brice Goglin
11c827c588
Merge tag 'mesa_7_0_2' into debian-unstable
...
Conflicts:
.gitignore
progs/demos/.gitignore
progs/directfb/Makefile
progs/egl/Makefile
progs/fbdev/Makefile
progs/fp/Makefile
progs/miniglx/Makefile
progs/samples/.gitignore
progs/slang/Makefile
progs/tests/.gitignore
progs/tests/Makefile
progs/tools/trace/Makefile
progs/trivial/Makefile
progs/vp/Makefile
progs/xdemos/.gitignore
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/mesa/Makefile
src/glut/directfb/Makefile
src/glx/mini/Makefile
2007-11-11 00:24:52 +01:00
Brian
8a40b670c3
added md5 checksums
2007-11-10 09:53:00 -07:00
Brian
d9fa5cbfc9
final changes for 7.0.2 relesae
2007-11-10 09:41:52 -07:00
Benno Schulenberg
1c21564292
code clean-ups, reformatting
2007-11-09 08:53:41 -07:00
Benno Schulenberg
6cc96bf156
remove commented-out code
2007-11-09 08:53:15 -07:00
Brian
29afd4bbc4
fix blender/unichrome crash, bug 13142
2007-11-08 07:36:30 -07:00
Benno Schulenberg
4e3db063ec
fix Unichrome/Blender crash, bug 13142
2007-11-08 07:36:30 -07:00
Brian
6560744c38
added -fno-strict-aliasing and -fPIC flags
2007-11-08 07:36:30 -07:00
Brian
572ad87881
change filenames for rc2
2007-11-08 07:36:30 -07:00
Michel Dänzer
2ab75d6cfa
r200: Fix SetTexOffset format for 16 bit pixmaps/textures.
...
Use symbolic array indices to clarify.
2007-11-06 18:39:50 +01:00
Chris Rankin
041a8eb5ec
r200: Implement SetTexOffset hook.
...
Implementation guidance by Michel Dänzer, final testing by Timo Aaltonen.
2007-11-06 18:32:33 +01:00
Brian
c1c13bdcfa
Check for NULL VB->EdgeFlag array.
...
There might be a bug elsewhere, but this is a simple work-around for now.
See bug 12614
2007-11-05 14:43:03 -07:00
Brian
403edd34dd
fix mmx code (bug 12614)
2007-11-05 14:38:12 -07:00
Brian
f279e48416
fix mmx code (bug 12614)
2007-11-05 14:38:05 -07:00
Brian
bf854d8d27
SSE codegen fixes
2007-11-03 08:45:42 -06:00
Brian
f334121679
Fix mem leak in SSE code generation path (Michel Dänzer) and don't crash if _mesa_exec_malloc() returns NULL.
2007-11-03 08:44:48 -06:00
Dan Nicholson
b88e2be609
Add -fno-strict-aliasing workaround for all GCC targets
...
Use a GCC option to work around aliasing bugs. See commit 013dbcd
for
more details.
(cherry picked from commit 01b18abf93
)
Conflicts:
configs/freebsd
2007-11-01 11:07:02 -07:00
Dan Nicholson
08229c8bb8
configs: Set -fexceptions for GLUT on linux-dri like other targets
...
Quite a while ago, the GCC option -fexceptions was added for building
libglut. See here:
http://article.gmane.org/gmane.comp.video.mesa3d.devel/9499
This was missing in the linux-dri targets.
(cherry picked from commit dbcd20f1c2
)
2007-11-01 11:02:05 -07:00
Dan Nicholson
c984017f71
configs: Always use -fPIC for shared libraries, never for static
...
Mesa currently disables -fPIC for DRI on x86, but most Linux distros are
re-enabling -fPIC for all DRI arches. Let's just do that here since
that's normally what's wanted for shared libraries. Some justification:
http://bugs.gentoo.org/show_bug.cgi?id=110840#c9
On the other hand, position-independent code is only necessary when
building shared libraries, so disable it for the static cases.
(cherry picked from commit c3b5adaa9a
)
2007-11-01 11:01:10 -07:00
Dan Nicholson
00e7dd8a13
Add -fno-strict-aliasing workaround for Linux GCC targets
...
Most Linux distros work around aliasing problems in Mesa by compiling
with the GCC option -fno-strict-aliasing. Two examples:
https://bugs.freedesktop.org/show_bug.cgi?id=6046
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=394311
This makes -fno-strict-aliasing the default with a comment that
developers should consider commenting it out. There is a already a note
about these bugs in docs/helpwanted.html.
(cherry picked from commit 013dbcd611
)
2007-11-01 10:56:01 -07:00
Brian
d11b375b16
fix typo
2007-10-31 09:43:17 -06:00
Brian
d1afa8146f
updated help/to-do list
2007-10-31 09:40:58 -06:00
Brian
31d4ba8a93
glDrawArrays(count=0) bugfix
2007-10-31 09:40:20 -06:00
Brian
1a7640958c
check for count==0 in _mesa_validate_DrawArrays()
2007-10-31 09:39:20 -06:00
Brian
2e2a5a450b
note G33/Q33/Q35 support
2007-10-31 08:19:14 -06:00
Brian
574fd63ff0
fix GL_ATI_separate_stencil
2007-10-30 10:46:31 -06:00
Brian
1063d47526
Alias glStencilOpSeparateATI with glStencilOpSeparate.
...
(Cherry-pick from master)
2007-10-30 10:45:47 -06:00
Brian
b59a892d3e
Finish up ATI_separate_stencil
...
Add entrypoints to glapi XML file and regenerate files.
Implement glStencilOpSeparateATI().
Consolidate some code in stencil.c
Conflicts:
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/enums.c
src/mesa/main/state.c
src/mesa/sparc/glapi_sparc.S
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S
2007-10-30 10:34:26 -06:00
Roland Scheidegger
6e5d5d77df
add missing _mesa_StencilFuncSeparateATI function
2007-10-30 10:26:56 -06:00
Dan Nicholson
a6319d18cf
Build xdemos programs by default on linux-dri
...
Since libglut is no longer hardcoded, we can build the xdemos programs
so long as a GLX enabled libGL and libGLU have been built.
(cherry picked from commit 06ca14543e
)
2007-10-29 12:08:34 -07:00
Dan Nicholson
5103e883fd
update APP_LIB_DEPS for static library configs (patch 3/3)
...
(cherry picked from commit 162914675a
)
2007-10-29 12:06:50 -07:00
Dan Nicholson
98c4ea4b24
simplify APP_LIB_DEPS (patch 2/3)
...
(cherry picked from commit 9ef1d9f03a
)
2007-10-29 12:06:23 -07:00
Dan Nicholson
29b8cac7d7
specify app lib dependencies in Makefiles (patch 1/3)
...
(cherry-picked from commit c05aa5ec4c
)
Conflicts: progs/demos/Makefile
progs/xdemos/Makefile
2007-10-29 12:05:54 -07:00
Dan Nicholson
cdb02d43fe
linux-dri-xcb: Fix undefined refs when linking with libGL
...
GL_LIB_DEPS was missing -lXdamage and -lXfixes, which was causing
linker errors when trying to build the programs.
(cherry picked from commit 3b9e28d507
)
2007-10-29 11:44:30 -07:00
Michel Dänzer
50cecddc4a
driFenceType: Really return fence type, not flags.
...
This typo could lead to the i915tex driver waiting for an EXE only fence as RW,
causing it to abort with an error.
2007-10-29 13:27:59 +00:00
Alan Hourihane
177f6398e5
Only set R_MODE with NV_point_sprite
2007-10-28 20:08:15 +00:00
Dan Nicholson
887bd6a46f
configs: Fix linux-static to link correctly
...
The linux-static target was missing necessary libraries and hardcoding
their location to /usr/X11R6/lib. This makes it comparable to the x86
and x86-64 static targets.
(cherry picked from commit 9514209593
)
2007-10-26 15:49:00 -07:00
Brian
9af5153410
use grep -q
2007-10-25 14:48:08 -06:00
Dan Nicholson
0e2103689e
More ignored programs merged back from master
...
Some more entries in progs/*/.gitignore that were in master.
2007-10-25 11:59:26 -07:00
Brian
2c496d8e46
simplify/fix the ASM_FLAGS tests (bug 12931)
2007-10-25 11:12:17 -06:00
Brian
8f0ba02e44
Cray Xt3 config
2007-10-25 11:12:07 -06:00
Brian
524c56e417
Fix merge
2007-10-24 16:36:00 -06:00
Brian
773f3a266c
added catamount-osmesa-pgi config, fixes for cross-compiling
2007-10-24 16:35:47 -06:00
Brian
882ada0d22
don't build x86, x86-64 dirs if not needed
2007-10-24 16:33:24 -06:00
Brian
6229005f93
properly init dst reg's CondMask/Swizzle fields
2007-10-23 10:55:14 -06:00
Brian
6c63b35ef7
bump up MAX_INSTRUCTIONS and add an assertion to catch emitting too many instructions
2007-10-23 10:25:34 -06:00
Brian
fb85e50e09
add directfb glut sources to tarball
2007-10-23 08:22:11 -06:00
Brian
5e5f908d0c
don't apply ColorMask to main gc
2007-10-22 17:54:07 -06:00
Michel Dänzer
c09e2143c7
i915tex: Don't emit 'empty' blit rectangles.
...
The hardware seems to interpret them differently and produce unexpected
results...
2007-10-17 18:28:46 +02:00
Brian
74ced1e67f
fix fog, rescale_normals bugs (from gallium branch)
2007-10-15 18:02:14 -06:00
Andreas Micheler
dd02c1609e
faster write_rgba_span_front()
2007-10-15 08:28:06 -06:00
Brian
cdf4880a79
replace 'brick' with correct program name in printfs
2007-10-10 10:57:37 -06:00
Mrc Gran
2ec8e8547d
fix force_s3tc_enable option
2007-10-10 09:16:12 -06:00
Dan Nicholson
b7c36d1d33
Ignore more generated files in progs/
...
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
Conflicts:
progs/demos/.gitignore
progs/tests/.gitignore
progs/xdemos/.gitignore
2007-10-10 08:49:59 -06:00
David Nusinow
8913402b74
Revert "* Disable building i915tex."
...
This reverts commit 76556f8264
.
2007-10-06 17:54:29 -04:00
David Nusinow
c00dfefd6f
Revert "Don't release just yet."
...
This reverts commit c3de7b5ade
.
2007-10-06 17:54:13 -04:00
David Nusinow
c3de7b5ade
Don't release just yet.
2007-10-04 23:10:47 -04:00
David Nusinow
76556f8264
* Disable building i915tex.
...
It was previously only built on x86 and amd64. It was never
production-ready and relies on a kernel interface that never went
upstream.
2007-10-04 22:49:27 -04:00
Xiang, Haihao
970d18a708
Brian's fix for bug9829
2007-10-04 00:08:18 +02:00
Roland Scheidegger
9456e7f0ff
minor fog calc cleanup
2007-10-03 22:34:36 +02:00
Roland Scheidegger
a5db24adc2
fog: fix issues with negative fog coords (may fix #10529 )
...
Rework tnl fog a bit. Make sure we always use ABS(eyez) when fog coord source
is depth, OTOH it does not seem to be necessary to use it (as was done before
in some cases) if fog coord source is fogcoord (just to save some work).
This fixes tests/fog (the first 2 cases) with i915/i915tex.
2007-10-03 22:33:26 +02:00
Roland Scheidegger
17664e2620
make sure optimized fog params get updated
2007-10-03 22:33:03 +02:00
Roland Scheidegger
43a0eb0253
unbreak 3d textures (typo when setting tex layout)
2007-10-03 22:32:33 +02:00
Michel Dänzer
bcdaed2c0a
i915tex: Work around texture pitch related performance drops on i915 at least.
2007-10-03 10:48:56 +02:00
Brian
78c6637db5
updated glext.h license info (Khronos), plus other clean-ups
2007-10-01 17:56:48 -06:00
Brian
44214a98fd
fix VBO-split infinite loop (bug 12164)
2007-09-29 12:01:47 -06:00
Dan Nicholson
9cc6d2310c
add support for LDFLAGS env var
2007-09-28 18:47:11 -06:00
Brian
1a045954be
update the DRM/DRI instructions
2007-09-28 18:43:12 -06:00
Dave Airlie
b3fc9a1585
i965: fix vblank on 965gm laptops by bringing in code from i915
...
jbarnes has better fixes for this in 7.1, but for 7.0.2 this seems like the best
plan, for distros to pick it up.
2007-09-28 12:02:27 +10:00
Xiang, Haihao
2a86a449ca
mesa: make sure the gotten value isn't greater than the
...
max depth buffer value on 64bit system. fix bug #12095
2007-09-27 10:44:45 -06:00
Xiang, Haihao
44f032db61
i965: handle all unfilled mode in clip stage. fix bug #12453
2007-09-27 10:40:22 -06:00
Brian
5a520729ee
prep for 7.0.2 release
2007-09-27 10:35:10 -06:00
Brian
36fbe78c60
for Miniglx, use git sources
2007-09-27 10:34:44 -06:00
Brian
029bb17770
bump versions to 7.0.2
2007-09-27 10:30:13 -06:00
Brian
7958bee6be
fix blend bug 12164
2007-09-27 10:25:57 -06:00
Brian
0b9bb21ce4
Restore old _TriangleCaps code to fix Blender problem (bug 12164)
2007-09-27 10:25:33 -06:00
Roland Bär
cfcc5b794e
[i965] Bug #11812 : Fix fwrite return value checks in AUB file code.
2007-09-26 08:00:17 -06:00
Zou Nan hai
925ff408a6
fix fd.o bug #12217 , recalcuate urb when clip plane size change
2007-09-26 07:59:41 -06:00
Xiang, Haihao
f40ca444f5
i965: The cube map texture coordinates must be devided by the
...
component with the largest absolute value before they are
delivered. fix bug #12421
2007-09-26 07:58:57 -06:00
Zou Nan hai
638a5e0382
fix a bug in 965 ARB_occlusion_query,
...
fd.o bug #12132
2007-09-26 07:58:29 -06:00
Brian
6d777bf055
fix DrawRangeElements error msg
2007-09-23 13:57:36 -06:00
Brian
ae6d4e8bc0
fix -D_BSD_SOURC
2007-09-20 18:42:59 -06:00
Brian
f2728724d3
fix for __IBMC__
2007-09-20 15:12:42 -06:00
Brian
bc95b34cce
added bluegene-xlc-osmesa, fortran fixes
2007-09-20 15:12:21 -06:00
Brian
9eb89616af
fixes for bluegene-xlc-osmesa config
2007-09-20 15:10:35 -06:00
Brian
f7713a6d81
Added bluegene-xlc-osmesa config (Alexander Neundorf)
2007-09-20 15:09:54 -06:00
Brian
1cec9b727a
fix bug 10604
2007-09-14 13:43:58 -06:00
Brian
18a4730f5b
From trunk: mesa: bind VBO_ATTRIB_XXX to correct input array when executing a display list. fix #10604
...
This also fixes Bill Mitchell's Fortan/plot bug.
2007-09-14 13:43:09 -06:00
Brian
1342aefcdd
updated link
2007-09-14 09:57:16 -06:00
Brian
1fd4b1e702
fix glCopyPixel/glPixelZoom bug 12417)
2007-09-14 09:57:08 -06:00
Brian
32dff44c28
fix copypixels overlap test bug ( #12417 )
2007-09-14 09:56:05 -06:00
Brian
e7c2ae476a
fix ARB fp/vp parsing bug 12313
2007-09-13 11:42:48 -06:00
Brian
a66301f83d
added program_error2() function for better error reporting
2007-09-13 11:41:44 -06:00
Brian
a5f7d56221
Fix state.texgen parsing error (bug 12313).
...
Replace *(*inst++) with *(*inst)++ in a few places.
2007-09-13 11:29:51 -06:00
Brian
140080c1ec
added .pc.in files to tarballs
2007-09-13 09:27:06 -06:00
Brian
ef43af6d43
added DSTDIR, pkg-config items
2007-09-12 10:12:20 -06:00
Brian
949d0532f0
updated with pkg-config info
2007-09-12 10:12:06 -06:00
Dan Nicholson
96efc76d74
pkg-config support
2007-09-12 10:03:31 -06:00
Dan Nicholson
6ca0d63692
DESTDIR support.
2007-09-12 10:01:06 -06:00
Xiang, Haihao
95fc2485e2
i965: fix bug#11925
2007-09-12 16:58:45 +08:00
Xiang, Haihao
d6ce1e4834
i965: fix #11378
2007-09-12 15:29:11 +08:00
Brian
2cc2b12fc7
fix indirect rendering crash
2007-09-11 10:59:10 -06:00
Brian
2259f81cf7
In _mesa_make_current(), don't unbind FBOs from the old context.
...
This fixes the X server crash reported by KeithP on Aug 29.
The old context's FBOs will be unreferenced during context destruction so
there's no memleak with this change.
2007-09-11 10:59:10 -06:00
Brian
791f12880f
Update depth test state when binding new framebuffer object
2007-09-11 09:25:49 -06:00
Brian
7aa7373a64
fix comment
2007-09-11 09:25:49 -06:00
Xiang, Haihao
2f186a190f
i965: take the secondary color into account when drawing
...
bitmap. fix#10688
2007-09-11 17:03:07 +08:00
Xiang, Haihao
357893a873
i965: limit on LOD Bias, fix#11987
2007-09-11 17:02:15 +08:00
Brian
a17881da5f
clean-up (see bug 12317)
2007-09-10 08:36:01 -06:00
Brian
4872ee83a9
updated VC7 project files
2007-09-05 10:05:48 -06:00
Christoph Kubisch
5ec222a832
updated VC7 project files
2007-09-05 10:01:58 -06:00
Brian
40438b3440
Use temporary matrix in __gluInvertMatrixd() to fix aliasing problem (see bugs 12269, 6748)
2007-09-03 16:21:12 -06:00
Xiang, Haihao
e0b80660c8
fix bug#11009
2007-09-01 15:31:49 +08:00
Xiang, Haihao
a2016301f5
i965: Take the upper limitation on LOD into account.
2007-09-01 15:14:58 +08:00
Brian
7ec6729fb6
sync with trunk, fixing bug 12239
2007-08-31 16:36:17 -06:00
Brian
837a2cf72e
fix i965 bugs, x86-64 bugs
2007-08-31 16:35:38 -06:00
Roland Scheidegger
0adca14536
fix another occurence of movaps which might not be aligned
2007-08-31 00:06:30 +02:00
Brian
57b0f66c6d
s/movaps/movups/ (see bug 12216)
2007-08-30 08:41:43 -06:00
Xiang, Haihao
e47e7a9571
i965: store read drawable info in intel_context. Some OpenGL
...
operations are based on read drawable. fix bug#10136.
2007-08-30 14:06:26 +08:00
Xiang, Haihao
68ca01560f
i965: check NULL pointer. fix bug#12193
2007-08-30 14:06:19 +08:00
Xiang, Haihao
64f1c91fcb
i965: samplers group in fours in WM_STATE. fix bug#9415
2007-08-30 14:05:56 +08:00
Xiang, Haihao
7d33f94198
i965: flush batch buffer when getting the maximum. This makes
...
some 3D programs such as pymol work well.
2007-08-30 14:05:39 +08:00
Julien Cristau
369cda3752
Prepare changelog for upload.
2007-08-28 12:11:47 +02:00
Julien Cristau
846078d06f
Delete generated files.
2007-08-28 12:07:45 +02:00
Julien Cristau
b18500d56e
* Update to latest git (from mesa_7_0_branch)
...
+ adds support for some new intel chipsets (i915 and i915_tex dri drivers)
(closes : #437333 )
+ broken inline asm in dri drivers fixed (closes : #423739 )
2007-08-28 12:07:25 +02:00
Julien Cristau
7d92c50490
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
2007-08-28 11:06:22 +02:00
Brian
d69a596193
Fixed bugs 6748, 12141
2007-08-27 10:48:31 -06:00
Colin McDonald
8aa4ae638e
fixed problem with big glDrawArrays (see bug 12141)
2007-08-27 10:47:49 -06:00
Brian
3069f34841
new __gluInvertMatrix() function (Mesa bug 6748)
2007-08-27 10:36:25 -06:00
Adam Jackson
b3788a0e4f
Unbreak Linux builds with -fvisibility=hidden.
2007-08-24 08:49:59 +01:00
Brian
582bc029ab
remove CallDepth++/-- accidentally removed in prev commit
2007-08-24 08:45:27 +01:00
Brian
e9e3099433
remove unneeded CallStack array
2007-08-23 08:17:35 +01:00
Brian
4fc561cc7b
refactor bounds checking code
2007-08-20 13:12:10 +01:00
Brian
ad3e3a0b99
don't map buffer in _mesa_validate_DrawElements() unless needed
2007-08-20 12:55:26 +01:00
Brian
bfb8c849cb
Remove recent texobj refcount debug/logging code.
2007-08-16 09:11:11 +01:00
Michel Dänzer
09dd25b5d1
i915tex: Unreference texture buffers on context destruction.
...
Not doing this could cause the buffers to leak under some circumstances.
2007-08-16 08:45:16 +02:00
Roland Scheidegger
c48efb1dbe
suppress warning about ncon visuals (bug #6689 )
2007-08-16 02:43:45 +02:00
Brian
5408acb6b7
log deleting/binding of FBOs
2007-08-15 15:47:28 +01:00
Brian
15481160f9
more debug output (context destroy, fb destroy)
2007-08-15 12:52:00 +01:00
Brian
00ccff03a5
Rewrite quite a bit of the code for glPush/PopAttrib() for texture state.
...
Remove the Saved1D/2D/etc fields from gl_texture_attrib in mtypes.h
Use a new texture_state struct in attrib.c that has the extra information
for restoring texture object state and saving references to the texture
objects (so they can't accidentally get deleted while referenced by the
attribute stack). All the texobj refcounting is mutex-protected now.
2007-08-15 11:21:06 +01:00
Brian
21594921b1
copy Target in _mesa_copy_texture_object()
2007-08-15 11:18:38 +01:00
Brian
42c91eebc9
Added _mesa_free_attrib_data() to free anything left in the attribute stack upon context destruction.
...
Also, a bit more refcount debug info.
2007-08-15 10:10:02 +01:00
Brian
88273e08b4
more tex obj ref count debugging (temporary)
2007-08-15 08:55:03 +01:00
Brian
08f7fb45ef
added some temporary texobj ref counting debug output
2007-08-14 19:45:02 +01:00
Brian
75ebda3ce6
Fix a few more problems with freeing FBOs/textures during context destruction.
...
Free FBOs before textures since the later may be referenced by the former.
Need to bind the context we're destroying if there isn't a current context
so that ctx->DeleteTexture() etc can be used.
2007-08-14 11:57:16 +01:00
Brian
53ff15fcbf
fix blending/banding bug
2007-08-13 21:17:04 +01:00
Dan Torop
72adb70ee2
fix spantmp2 READ_RGBA inline asm ( #11931 )
2007-08-13 21:14:51 +01:00
Brian
960d41fcfe
added more i915/945 chipsets
2007-08-13 21:11:17 +01:00
Brian
0c4e35b070
Add PCI IDs for the G33, Q33, and Q35 chipsets.
...
Conflicts:
src/mesa/drivers/dri/i915/i915_texstate.c
src/mesa/drivers/dri/i915/intel_context.c
src/mesa/drivers/dri/i915/intel_context.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/intel_tex.c
2007-08-13 21:06:33 +01:00
Wang Zhenyu
c53f1cb813
i915tex: Add support for 945GME
2007-08-13 21:00:28 +01:00
Brian
f6696cc15e
free any render/framebuffers left in hash tables when freeing shared state
2007-08-13 17:39:05 +01:00
Michel Dänzer
fef9a41fe4
i915tex: Make sure pitch is aligned properly for render-to-texture.
...
Just always align texture pitch to multiples of 64 bytes for now, pending a
more sophisticated scheme to do it only when really necessary.
2007-08-13 13:22:43 +02:00
Brian
e279a0a076
Implement mutex/locking around texture object reference counting.
...
Use new _mesa_reference_texobj() function for referencing/unreferencing
textures. Add new assertions/tests to try to detect invalid usage of
deleted textures.
2007-08-13 11:28:52 +01:00
Brian
88c8aaed96
fix link to 7.0.1 relnotes
2007-08-09 15:59:38 +01:00
Julien Cristau
34beaefe1c
Prepare changelog for upload.
2007-08-09 16:00:58 +02:00
Julien Cristau
10b828f193
New upstream release.
2007-08-09 11:56:00 +02:00
Julien Cristau
43e6260ed0
Merge tag 'mesa_7_0_1' into debian-experimental
2007-08-09 11:25:42 +02:00
Brian
62cbbd7226
fix byte swap bug for GLuint stencil indexes (bug 11909)
2007-08-09 08:45:01 +01:00
Brian
f7cbe7fcee
move free() after dereference (bug 11878)
2007-08-07 22:06:48 +01:00
Brian
d8e4ff9079
fix potential NULL dereference (bug 11879)
2007-08-07 21:56:39 +01:00
Brian
510ff27eda
remove SHELL line, replace -e test with new logic (Daniel Stone)
2007-08-07 21:52:22 +01:00
Brian
5abf055100
fix potential NULL dereference (bug 11880)
2007-08-07 21:46:42 +01:00
Brian
4bb5721f6b
fix swizzle error test (bug 11881)
2007-08-07 21:43:46 +01:00
Brian
c41ab70d3a
initial 7.0.2 notes
2007-08-07 08:44:35 +01:00
Brian
a05e403bf2
fix bug 9962 (vbo splitting) as in trunk
2007-08-07 08:43:31 +01:00
Brian
2f57e0f71d
Merge branch 'mesa_7_0_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
2007-08-07 08:21:50 +01:00
Brian
95a2eb9767
fix even-sized point positioning (bug 11874)
2007-08-07 08:20:18 +01:00
Brian
55175daed7
added md5 sums
2007-08-03 13:54:55 -06:00
Brian
ae16a51e95
added GLU bug fixes
2007-08-03 13:39:09 -06:00
Brian
4398d67546
update 7.0.1 release info/date
2007-08-03 13:32:47 -06:00
Brian
c93738687c
remove -rc2
2007-08-03 13:32:28 -06:00
Brian
799492e606
add OSMESA_LIB_NAME
2007-08-03 10:08:16 -06:00
Brian
f33ff071bb
added -lm
2007-08-03 07:24:33 -06:00
Brian
99e854743c
added bluegene-osmesa
2007-08-02 14:24:05 -06:00
Brian
6f79062d91
OSmesa on BlueGene (Alexander Neundorf)
2007-08-02 14:22:52 -06:00
Brian
2f682c3995
fix stencil value masking bug 11805, and fix sizeof() bug
2007-08-02 09:08:53 -06:00
Brian
067370e68f
fix invalid pointer usage in bezierPatchDeleteList(), bug 11807
2007-08-02 08:40:58 -06:00
Brian
2aa439a6a4
fix double free()s (bug 11808)
2007-08-02 08:38:10 -06:00
Brian
b477182dc3
s/MAX_TEXTURE_LEVELS/SIS_MAX_TEXTURE_LEVELS/ and add assertion (bug 11806)
2007-08-02 08:35:27 -06:00
Michel Dänzer
a8964ca89e
i915tex: Better attempt to release miptree when overriding texture image.
...
The previous approach could lead to crashes in FBO code that dereferences the
miptree struct pointer unconditionally.
2007-08-02 12:14:03 +02:00
Brian
4f0e92d07c
Merge branch 'mesa_7_0_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
2007-08-01 17:03:09 -06:00
Brian
577f4e8a5f
Obsolete
2007-08-01 11:45:47 -06:00
Brian
0586d9fe56
fix error code test limit (bug 11795)
2007-08-01 11:27:47 -06:00
Michel Dänzer
1f0d9bf05e
i915tex: Missing piece of SetTexOffset hook implementation for I830 generation.
2007-08-01 17:46:32 +02:00
Michel Dänzer
8bcae2a527
i915tex: Implement SetTexOffset hook.
...
Only build tested for I830 generation.
2007-08-01 17:46:31 +02:00
Michel Dänzer
35ca9aae91
r300: Implement SetTexOffset hook.
2007-08-01 17:46:30 +02:00
Michel Dänzer
6cdd2bf8d7
Add interfaces for overriding texture images with driver specific 'offsets'.
...
To be used by AIGLX for GLX_EXT_texture_from_pixmap without several
additional data copies.
2007-08-01 17:46:29 +02:00
Brian
ce7d175adb
fix mem leak (bug 11793)
2007-08-01 08:42:13 -06:00
Brian
1904fd095f
fix mem leak (bug 11791)
2007-08-01 08:42:09 -06:00
Brian
897d0ac5cc
fix some FreeBSD issues
2007-07-31 14:57:54 -06:00
Brian
e262d0182f
fix failure caused by undeclared variable (bug 11783)
2007-07-31 09:43:40 -06:00
Brian
aa5b748c10
glGetAttribLocation always returned 1 (bug 11774)
2007-07-31 09:29:31 -06:00
Julien Cristau
c6728df4a3
Merge tag 'mesa_7_0_1_rc2' into debian-experimental
2007-07-31 04:00:13 +02:00
Brian
3c182c5bc8
Added sunos5-v9-cc-g++ config (Roland Egger)
2007-07-30 09:00:09 -06:00
Brian
1b5677847b
_mesa_pack_bitmap() fix from trunk
2007-07-30 08:13:05 -06:00
Brian
1be59a9dbe
dlist polygon stipple fix from trunk
2007-07-30 08:12:29 -06:00
Brian
55c2178ad4
fix bug 11754
2007-07-29 18:28:09 -06:00
Jan Dvorak
3e3d392e1c
fix glPointParameteriv bug 11754
2007-07-29 18:26:55 -06:00
Julien Cristau
593de57fa2
Prepare changelog for upload.
2007-07-27 20:18:21 +02:00
Julien Cristau
04b0e43ea6
New upstream release candidate.
2007-07-27 19:59:38 +02:00
Julien Cristau
04eee290c8
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
2007-07-27 19:58:30 +02:00
Brian
756a7a4e4b
minor tweaks
2007-07-27 11:44:55 -06:00
Brian
121b4ac220
More Mingw32 fixes from Zhang (zxpmyth@yahoo.com.cn)
2007-07-27 11:12:21 -06:00
Brian
cdbd5db3af
release candidate 2
2007-07-27 11:10:00 -06:00
Brian
b2240f6ad4
fix bug 11731
2007-07-26 15:33:39 -06:00
Brian
33814a55f8
Fix function call bug 11731. Also, fix up IR_CALL/IR_FUNC confusion.
2007-07-26 15:32:34 -06:00
Brian
a57c5a417b
generate error upon writing to varying var in fragment program (bug 11733)
2007-07-26 11:39:37 -06:00
Brian
ff1a28de17
clamp float colors
2007-07-26 08:19:40 -06:00
Brian
772f57f99b
call ctx->Driver.NewProgram() instead of _mesa_new_program()
2007-07-24 09:56:54 -06:00
Brian
dacee32b8b
fix logic error, typos
2007-07-24 09:19:44 -06:00
Brian
fa1a3eb06d
fix GLX_STEREO bug
2007-07-23 16:54:35 -06:00
Brian
bd4817ca54
fix GLX_STEREO handling (bug 11705)
2007-07-23 16:51:03 -06:00
Julien Cristau
d3a160e217
New upstream release candidate.
2007-07-23 16:39:48 +02:00
Julien Cristau
c5837f2791
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
2007-07-23 16:28:56 +02:00
Julien Cristau
490bd43f18
Merge branch 'debian-unstable' of git+ssh://git.debian.org/git/pkg-xorg/lib/mesa into debian-experimental
...
Conflicts:
debian/changelog
2007-07-23 16:28:10 +02:00
Brian
005eea249c
Fix a number of MINGW32 issues (Zhang <zxpmyth@yahoo.com.cn>)
2007-07-21 11:27:22 -06:00
Brian
9747de8ec6
drop VC6 and VC7 project files until updated
2007-07-21 10:03:30 -06:00
Brian
849a9799d0
fix bug 11588
2007-07-13 16:37:18 -06:00
Jan Dvorak
e32ae4fe33
fix shader/info string length queries (bug 11588)
2007-07-13 16:35:19 -06:00
Brian
4595389c4c
fix width/depth mix-up (bug 11577)
2007-07-12 21:43:39 -06:00
Brian
e8ccc7cc49
Merge branch 'mesa_7_0_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
2007-07-12 14:49:56 -06:00
Brian
673d21047a
fix swizzle-related bug 11534
2007-07-12 14:49:24 -06:00
Julien Cristau
6186261589
Prepare changelog for upload.
2007-07-11 05:51:34 +02:00
Julien Cristau
45310e219c
Relax libgl1-mesa-dev dependency on libgl1-mesa-glx.
...
Change the >= ${source:Version} dependency to >= ${source:Upstream-Version}.
This way libgl1-mesa-dev stays installable after a minor revision bump on
architectures where mesa isn't built yet.
2007-07-11 05:45:30 +02:00
Julien Cristau
250f6b2c88
Replace ${Source-Version} with ${source:Version} in one remaining spot.
2007-07-11 05:34:30 +02:00
Michel Dänzer
fdefc2bbda
i915tex: Better procedure for dropping batchbuffer on virtual resolution change.
...
The previous procedure would often result in a GPU lockup.
2007-07-10 11:02:18 +02:00
Michel Dänzer
2079df8527
i915tex: Only wait for vblank when really necessary.
...
This avoids superfluous waits for vblank timing out under some circumstances.
2007-07-10 10:54:51 +02:00
Michel Dänzer
b53659452c
Clear pointers to freed cliprects.
...
Not doing this could lead to double frees under rare circumstances.
2007-07-10 10:49:28 +02:00
Michel Dänzer
46f1d6653e
Remove dubious compile-time test for pre-2.4 Linux kernels.
...
LINUX_VERSION_CODE shouldn't be used by userspace code, it can be defined empty
these days.
If anybody still cares about 2.2 kernels, they should reinstate this as a
proper runtime test.
2007-07-10 10:34:10 +02:00
Brian
c1938a60f7
Fix zero-size texture checking in _mesa_test_proxy_teximage(), bug 11309
2007-07-08 10:04:14 -06:00
Brian
d65110f352
Check if 'indices' is NULL, bug 11314
2007-07-08 09:21:21 -06:00
Brian
9fa3bbcb5a
check depthScale value for optimized ushort->uint case (fixes bug 11474)
2007-07-08 08:53:09 -06:00
Brice Goglin
19e51ecbe6
libgl1-mesa-dev does not need to depend on libgl1-mesa-dri, libgl1-mesa-glx is enough.
...
libgl1-mesa-glx was included in libgl1-mesa-dri before 6.4.1-0.1,
so libgl1-mesa-dev had to depend on libgl1-mesa-dri at this point.
Since libgl1-mesa-dri only contains the DRI modules now, it is not
required anymore for libgl1-mesa-dev.
2007-07-07 22:17:35 +02:00
Brian
99d62f2922
fix i915 polygon stipple bug
2007-07-06 16:53:28 -06:00
Brian
284743cafe
add GL_QUADS to i915_reduced_primitive_state() to fix redbook/polys demo
2007-07-06 16:52:34 -06:00
Xavier Bachelot
08d7307b2a
call glutInit(), bug 11486
2007-07-06 12:54:40 -06:00
Brian
ef6a64abe6
fix a syntax error (missing right-paren)
2007-07-05 16:04:10 -06:00
Brian
18bfa52ef7
fix bug 11475
2007-07-05 09:42:07 -06:00
Brian
d62be2652c
Copy from Mesa master. Includes fixes for bugs 11475 and 11448.
2007-07-05 09:40:37 -06:00
Julien Cristau
31f3433635
Prepare changelog for upload.
2007-07-05 00:56:56 +02:00
Samuel Thibault
639eaceee7
Fix build on hurd-i386.
...
Build libgl1-mesa-glx without direct rendering support on that arch, and
don't build any dri driver.
2007-07-05 00:48:30 +02:00
Eric Anholt
ea53ff80af
fix LogicOp/bitmap problem, bug 11133
2007-07-04 07:37:28 -06:00
Brian
feeca1bcbc
add fbdev/ to DEMO_FILES
2007-07-03 15:46:48 -06:00
Brian
12e7278c08
document GLSL fixes
2007-07-03 12:21:11 -06:00
Brian
45b5c44eb9
bring over Roland's DOT3_RGBA fix from master
2007-07-03 12:20:52 -06:00
Brian
e3456c1028
added vec2(vec4) constructor, bug 11404
2007-07-03 11:42:03 -06:00
Brian
327fb38573
add code for stpq, rgba writemasks in make_writemask(), bug 11404
2007-07-03 11:41:07 -06:00
Brian
1d25d9e15f
Bump version to 7.0.1
2007-07-03 10:04:41 -06:00
Brian
cc7cee3f48
Revert the version of libOSMesa.so to 6.5.3 to avoid linking issues that were caused by bumping to 7.0
2007-07-03 10:03:01 -06:00
Brian
d7062710cd
use _mesa_unpack_stencil_span() in draw_stencil_pixels(), bug 11457
2007-07-03 08:58:03 -06:00
Julien Cristau
3e21f52796
Make libgl1-mesa-swx11 depend on libosmesa6
...
libgl1-mesa-swx11 used to contain libOSMesa.so.6, so programs linked against
it don't necessarily depend on libosmesa6; their dependencies were broken
since mesa 6.5.2-1.
2007-07-03 05:34:07 +02:00
Brian
9bfba734d8
add const to wglSetPixelFormat() to match .h declaration
2007-07-02 10:15:39 -06:00
Julien Cristau
0511d9a9d2
Fix merge and delete symlinks which aren't in the tarball.
2007-07-01 02:55:59 +02:00
Brian
aaebf2f47e
regenerated
2007-06-29 07:51:49 -06:00
Brian
23f8d77b38
Add a few missing GL 2.0 entrypoints, regenerate related files.
...
Specifically:
glVertexAttrib4bv
glVertexAttrib4iv
glVertexAttrib4ubv
glVertexAttrib4uiv
glVertexAttrib4usv
2007-06-28 16:38:48 -06:00
Samuel Thibault
498b4dbba4
Fix build on hurd-i386.
...
Build libgl1-mesa-glx without direct rendering support on that arch, and
don't build any dri driver.
2007-06-28 22:33:05 +01:00
Julien Cristau
ecc42e79ae
Merge unreleased changelog entries
2007-06-28 22:01:05 +01:00
Julien Cristau
0bf8ed523d
* Add a shlibs file for libgl1-mesa-swx11-i686.
2007-06-28 21:58:42 +01:00
Brian
87d22ee0fe
initial 7.0.1 relnotes
2007-06-28 08:11:36 -06:00
zhang
52e25f63d4
a variety of fixes for MingW
2007-06-28 08:10:09 -06:00
Brian
f3fb67972b
remove obsolete t_save_api.c
2007-06-28 07:43:32 -06:00
Brian
6400756364
remove obsolete sources
2007-06-28 07:21:59 -06:00
David Nusinow
d71d04bf6f
Bite the bullet and add myself to uploaders
2007-06-27 22:54:52 -04:00
David Nusinow
af90259e09
Merge remote branch 'origin/debian-experimental' into debian-experimental
...
Conflicts:
debian/changelog
src/mesa/drivers/dri/r300/radeon_lock.c
2007-06-27 22:53:04 -04:00
David Nusinow
7c9762f698
Changelog bump
2007-06-27 21:32:51 -04:00
David Nusinow
b2e67fdb7c
Merge branch 'upstream-experimental' into debian-experimental
...
Conflicts:
.gitignore
progs/miniglx/miniglxtest.c
src/glx/mini/Makefile
src/glx/mini/miniglx.c
src/mesa/drivers/dri/r300/.gitignore
2007-06-27 21:29:16 -04:00
Brian
d59f0314bd
md5 sums for 7.0
2007-06-22 16:50:24 -06:00
Brian
131baefac3
fix date for 7.0 release
2007-06-22 16:41:36 -06:00
Brian
a450078b67
update version
2007-06-22 16:40:17 -06:00
Brian
f6b041bf6c
bring in Eric's FreeBSD fixes for -pthread
2007-06-22 15:40:46 -06:00
Brian
4f340d181a
set tentative 7.0 release date
2007-06-20 19:59:15 -06:00
Julien Cristau
74a11701f3
Shorten the one-line synopsis of various packages.
...
They're cut off in .changes files if they're too long.
Thanks, Marc 'HE' Brockschmidt!
2007-06-13 19:36:49 +02:00
Brian
b58e38e936
fix TEXTREL problem (bug 7459)
2007-06-12 09:52:05 -06:00
Brian
8713cb48a8
Fix TEXREL issues when using GLX_USE_TLS (see bug 7459).
2007-06-12 09:46:12 -06:00
Brian
277c5e57ed
fix GLX_USE_TLS breakage
2007-06-12 08:57:39 -06:00
Brian
b3d62d5af5
disable depthBits check in check_compatible(), see bug 11161
2007-06-08 12:36:00 -06:00
Brian
9c0f0c8d81
remove old comment about DEFAULT_SOFTWARE_DEPTH_BITS
2007-06-08 12:35:37 -06:00
Brian
18a0a2a7ac
document bug 11049 fix
2007-05-23 16:50:22 -06:00
Brian
8b99d9e33c
restore GL_TEXTURE_LOD_BIAS in _mesa_PopAttrib(), bug 11049
2007-05-23 16:49:19 -06:00
Brian
01e7e153e3
document point attentuation fix
2007-05-23 08:59:02 -06:00
Brian
0ad4ca24d2
Fix point attentuation problem (bug 11042)
...
ctx->Point._Attentuation was computed in wrong place and the VB->Eye coord Z
array wasn't indexed correctly in run_point_stage().
2007-05-23 08:56:45 -06:00
Brian
724a155552
if light position is local, treat it as a homogeneous coord and divide by W (see bug 11009)
2007-05-21 10:55:15 -06:00
Julien Cristau
e1b0715dd6
Prepare changelog for upload.
2007-05-21 11:35:28 +02:00
Julien Cristau
a5c6598966
Merge remote branch 'origin/debian-unstable' into debian-experimental
...
Conflicts:
debian/changelog
2007-05-21 11:33:42 +02:00
Roland Scheidegger
d38b74a316
fix miptree layout (i915) for small compressed mipmaps
...
This seems to work now. Also fix i945 set_level_info, need to match i915
behaviour for storing mip height, as it's assumed to be the mip width
(in texels) elsewhere and the division by 4 is done later (untested).
2007-05-19 04:43:50 +02:00
Roland Scheidegger
54cab4b47b
fix copy & paste bug of previous commit, breaking dxt5 formats
2007-05-19 03:56:06 +02:00
Roland Scheidegger
c093666bc5
fix miptree comparison with compressed textures
...
TexelBytes is always 0 with compressed textures, thus would never match
mt->cpp. This caused constant blitting around of textures, and it fixes at
least the horrible performance of Q3 if compressed textures are enabled.
2007-05-19 01:39:54 +02:00
Roland Scheidegger
04972f6761
fix small s3tc mipmaps ( #10968 )
...
make sure that always whole blocks are uploaded.
(May still not work correctly if the top mip map is not at least a full block,
that is 4 pixels wide - not sure, but probably doesn't happen in real world)
2007-05-19 01:39:16 +02:00
Brian
67f8234622
set version to 7.0
2007-05-18 09:41:34 -06:00
Brian
201d6dbd9c
fix STATE_HALF_VECTOR value (bug 10987)
2007-05-18 09:35:18 -06:00
Julien Cristau
1865ef6fd4
Prepare changelog for upload.
2007-05-18 13:36:42 +02:00
Ian Romanick
fbcac5aa83
Refactor determining whether a texture target can use compressed format
2007-05-17 14:45:25 -07:00
Brian
2b72ab8f8f
document glXDestroyPbuffer fix
2007-05-17 15:30:39 -06:00
Brian
0ea97b9408
In DestroyPbuffer(), use GetReq() intead of GetReqExtra(). See bug 10983.
2007-05-17 15:26:39 -06:00
Brian
28683ac7c0
version 7.0, not 7.1
2007-05-17 09:07:25 -06:00
Brian
c72e3e210f
version should be 7.0
2007-05-17 09:04:19 -06:00
Julien Cristau
a8c856d43c
Cherry-pick commmit 65faf023
by Michel Dänzer to fix r300 crash.
...
r300: Don't crash in radeonUpdatePageFlipping when !radeon->glCtx->DrawBuffer.
This feels like a kludge, maybe there's a better solution.
2007-05-09 15:09:12 +02:00
David Nusinow
1953cfc954
Update changelog
2007-04-30 00:08:11 -04:00
David Nusinow
8e7bac950e
Merge branch 'upstream-experimental' into debian-experimental
2007-04-29 23:23:00 -04:00
Julien Cristau
03cdacfb6a
Prepare changelog for upload.
2007-04-25 10:37:10 +02:00
Julien Cristau
30f3c3dfad
Update changelog.
2007-04-25 08:42:02 +02:00
Julien Cristau
dee1b0d5bb
Merge remote branch 'upstream/master' into debian-experimental
2007-04-25 08:40:39 +02:00
Julien Cristau
6f2b0fe463
New upstream release candidate.
...
Refresh a couple patches.
2007-04-25 01:48:33 +02:00
Julien Cristau
0c69176498
Merge tag 'mesa_6_5_3_rc3' into debian-experimental
2007-04-25 01:41:05 +02:00
Julien Cristau
4e7a0385b5
Merge tag 'mesa_6_5_3_rc2' into debian-experimental
2007-04-25 01:40:50 +02:00
Julien Cristau
4adbd94b10
Only install stuff in mesa-swx11-source if we're building arch:all packages.
2007-04-23 11:00:09 +02:00
Julien Cristau
4a2905b645
Delete obsolete file.
2007-04-22 18:08:58 +02:00
Julien Cristau
0638c6b530
Add generated files from the tarball so they're included in mesa-swx11-source.
2007-04-22 18:08:35 +02:00
Julien Cristau
7dd35ce013
Delete .gitignore files which do more harm than good in a debian package tree.
2007-04-22 18:07:52 +02:00
Julien Cristau
c8629c3178
Resync debian/scripts/install-source.sh.
2007-04-22 00:51:10 +02:00
Julien Cristau
77ccf51cb3
New upstream release candidate.
2007-04-22 00:50:40 +02:00
Julien Cristau
01197f0c77
Merge branch 'upstream-experimental' into debian-experimental
2007-04-22 00:34:30 +02:00
Julien Cristau
69c86ff4fd
Remove leftover file.
2007-04-22 00:33:38 +02:00
Julien Cristau
9a42ffad81
Add build-dependencies on libxdamage-dev and libxfixes-dev.
2007-04-21 21:23:21 +02:00
Julien Cristau
0d8633bf8c
Delete autogenerated files, and files not included in the tarball.
2007-04-21 21:20:37 +02:00
Julien Cristau
d79e80a3d0
New upstream release candidate.
...
Drop patches included upstream.
2007-04-21 20:47:01 +02:00
Julien Cristau
d890ebdd25
Merge branch 'upstream-experimental' into debian-experimental
...
Conflicts:
doxygen/Makefile
doxygen/common.doxy
doxygen/doxy.bat
doxygen/glapi.doxy
doxygen/header.html
doxygen/main.doxy
doxygen/math.doxy
doxygen/shader.doxy
doxygen/swrast.doxy
doxygen/swrast_setup.doxy
doxygen/tnl.doxy
doxygen/tnl_dd.doxy
progs/tests/Makefile
progs/tests/fbotest1.c
progs/tests/fbotest2.c
progs/tests/fbotexture.c
progs/tests/mipmap_limits.c
progs/tests/sharedtex.c
progs/tools/trace/gltrace_support.cc
progs/trivial/Makefile
src/egl/docs/EGL_MESA_screen_surface
src/egl/main/egllog.c
src/glx/mini/Makefile
src/glx/mini/driver.h
src/mesa/drivers/allegro/amesa.c
src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c
src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c
src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c
src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c
src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c
src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c
src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
2007-04-21 20:27:55 +02:00
Brice Goglin
5ee9b3ce72
Fix conflicts for libGLw packages.
...
libglw1-mesa does not have to conflict with earlier libgl1-mesa-swx11
(libGLw was only shipped as development libs/headers within swx11-dev).
libglw1-mesa-dev needs to conflicts with libglw-dev.
2007-04-21 20:20:03 +02:00
Brice Goglin
031b539a09
Split out libGLw libs and headers from libgl1-mesa-swx11.
...
Ship both static and shared libraries for libGLw, creating libglw1-mesa and
libglw1-mesa-dev (closes : #374904 ).
2007-04-21 20:19:38 +02:00
Brice Goglin
47c3c706e8
Add 09_i915_always_enable_pixel_fog.patch
2007-04-21 18:00:12 +02:00
Brice Goglin
0d830a616c
Add 08_r300_update_window_state_when_bound_but_stamp_changed.patch
2007-04-20 18:53:47 +02:00
Brice Goglin
e219bf8338
Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
2007-04-20 18:44:59 +02:00
Julien Cristau
6c0fba2480
Prepare changelog for upload.
2007-04-20 05:58:00 +02:00
Julien Cristau
f4cc159f53
Revert " * Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both"
...
This reverts commit 856ae782c7
.
Conflicts:
debian/changelog
2007-04-20 05:55:04 +02:00
Julien Cristau
04c002abc2
Revert "Fix conflicts for libGLw packages."
...
This reverts commit 048144074b
.
2007-04-20 05:53:59 +02:00
Julien Cristau
78fd17907e
Merge branch 'debian-experimental' into debian-unstable
2007-04-20 05:52:20 +02:00
Julien Cristau
47edc83080
Merge branch 'debian-experimental' into debian-unstable
...
Conflicts:
configs/debian-osmesa16
configs/debian-osmesa16-static
configs/debian-osmesa32
configs/debian-osmesa32-static
debian/changelog
debian/compat
debian/control
debian/copyright
debian/libgl1-mesa-dev.install
debian/libgl1-mesa-swx11-dev.install
debian/libgl1-mesa-swx11.shlibs
debian/libglu1-mesa-dev.install
debian/mesa-common-dev.docs
debian/mesa-common-dev.install
debian/rules
src/mesa/x86-64/matypes.h
src/mesa/x86/matypes.h
2007-04-20 05:44:24 +02:00
Julien Cristau
33e34f5bf4
Merge tag 'mesa_6_5_1' into debian-unstable
...
Conflicts:
progs/util/README
progs/util/glstate.c
progs/util/glstate.h
progs/util/sampleMakefile
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.cc
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/interface/glcurveval.cc
src/glu/sgi/libnurbs/interface/glimports.h
src/glu/sgi/libnurbs/interface/glinterface.cc
src/glu/sgi/libnurbs/interface/glrenderer.h
src/glu/sgi/libnurbs/interface/incurveeval.cc
src/glu/sgi/libnurbs/interface/insurfeval.cc
src/glu/sgi/libnurbs/interface/mystdio.h
src/glu/sgi/libnurbs/interface/mystdlib.h
src/glu/sgi/libnurbs/internals/arc.h
src/glu/sgi/libnurbs/internals/arcsorter.cc
src/glu/sgi/libnurbs/internals/arcsorter.h
src/glu/sgi/libnurbs/internals/arctess.h
src/glu/sgi/libnurbs/internals/backend.cc
src/glu/sgi/libnurbs/internals/backend.h
src/glu/sgi/libnurbs/internals/basiccrveval.h
src/glu/sgi/libnurbs/internals/basicsurfeval.h
src/glu/sgi/libnurbs/internals/bezierarc.h
src/glu/sgi/libnurbs/internals/bin.cc
src/glu/sgi/libnurbs/internals/bin.h
src/glu/sgi/libnurbs/internals/bufpool.cc
src/glu/sgi/libnurbs/internals/bufpool.h
src/glu/sgi/libnurbs/internals/cachingeval.cc
src/glu/sgi/libnurbs/internals/cachingeval.h
src/glu/sgi/libnurbs/internals/ccw.cc
src/glu/sgi/libnurbs/internals/coveandtiler.h
src/glu/sgi/libnurbs/internals/curve.cc
src/glu/sgi/libnurbs/internals/curve.h
src/glu/sgi/libnurbs/internals/curvelist.cc
src/glu/sgi/libnurbs/internals/curvelist.h
src/glu/sgi/libnurbs/internals/curvesub.cc
src/glu/sgi/libnurbs/internals/dataTransform.cc
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/defines.h
src/glu/sgi/libnurbs/internals/displaylist.cc
src/glu/sgi/libnurbs/internals/displaylist.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/flist.cc
src/glu/sgi/libnurbs/internals/flist.h
src/glu/sgi/libnurbs/internals/flistsorter.cc
src/glu/sgi/libnurbs/internals/flistsorter.h
src/glu/sgi/libnurbs/internals/gridline.h
src/glu/sgi/libnurbs/internals/gridtrimvertex.h
src/glu/sgi/libnurbs/internals/gridvertex.h
src/glu/sgi/libnurbs/internals/hull.cc
src/glu/sgi/libnurbs/internals/hull.h
src/glu/sgi/libnurbs/internals/intersect.cc
src/glu/sgi/libnurbs/internals/jarcloc.h
src/glu/sgi/libnurbs/internals/knotvector.h
src/glu/sgi/libnurbs/internals/mapdesc.cc
src/glu/sgi/libnurbs/internals/mapdesc.h
src/glu/sgi/libnurbs/internals/mapdescv.cc
src/glu/sgi/libnurbs/internals/maplist.cc
src/glu/sgi/libnurbs/internals/maplist.h
src/glu/sgi/libnurbs/internals/mesher.cc
src/glu/sgi/libnurbs/internals/mesher.h
src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc
src/glu/sgi/libnurbs/internals/monotonizer.cc
src/glu/sgi/libnurbs/internals/monotonizer.h
src/glu/sgi/libnurbs/internals/myassert.h
src/glu/sgi/libnurbs/internals/mycode.cc
src/glu/sgi/libnurbs/internals/mystring.h
src/glu/sgi/libnurbs/internals/nurbsconsts.h
src/glu/sgi/libnurbs/internals/nurbstess.cc
src/glu/sgi/libnurbs/internals/patch.cc
src/glu/sgi/libnurbs/internals/patch.h
src/glu/sgi/libnurbs/internals/patchlist.cc
src/glu/sgi/libnurbs/internals/patchlist.h
src/glu/sgi/libnurbs/internals/pwlarc.h
src/glu/sgi/libnurbs/internals/quilt.cc
src/glu/sgi/libnurbs/internals/quilt.h
src/glu/sgi/libnurbs/internals/reader.cc
src/glu/sgi/libnurbs/internals/reader.h
src/glu/sgi/libnurbs/internals/renderhints.cc
src/glu/sgi/libnurbs/internals/renderhints.h
src/glu/sgi/libnurbs/internals/simplemath.h
src/glu/sgi/libnurbs/internals/slicer.cc
src/glu/sgi/libnurbs/internals/slicer.h
src/glu/sgi/libnurbs/internals/sorter.cc
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/internals/splitarcs.cc
src/glu/sgi/libnurbs/internals/subdivider.h
src/glu/sgi/libnurbs/internals/tobezier.cc
src/glu/sgi/libnurbs/internals/trimline.cc
src/glu/sgi/libnurbs/internals/trimline.h
src/glu/sgi/libnurbs/internals/trimregion.cc
src/glu/sgi/libnurbs/internals/trimregion.h
src/glu/sgi/libnurbs/internals/trimvertex.h
src/glu/sgi/libnurbs/internals/trimvertpool.cc
src/glu/sgi/libnurbs/internals/trimvertpool.h
src/glu/sgi/libnurbs/internals/types.h
src/glu/sgi/libnurbs/internals/uarray.cc
src/glu/sgi/libnurbs/internals/uarray.h
src/glu/sgi/libnurbs/internals/varray.cc
src/glu/sgi/libnurbs/internals/varray.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/glimports.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.cc
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.cc
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/mystdio.h
src/glu/sgi/libnurbs/nurbtess/mystdlib.h
src/glu/sgi/libnurbs/nurbtess/partitionX.cc
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.cc
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.cc
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.cc
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.cc
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.cc
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.cc
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.cc
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libtess/README
src/glu/sgi/libtess/alg-outline
src/glu/sgi/libtess/dict-list.h
src/glu/sgi/libtess/dict.c
src/glu/sgi/libtess/dict.h
src/glu/sgi/libtess/geom.c
src/glu/sgi/libtess/memalloc.c
src/glu/sgi/libtess/memalloc.h
src/glu/sgi/libtess/mesh.c
src/glu/sgi/libtess/mesh.h
src/glu/sgi/libtess/normal.h
src/glu/sgi/libtess/priorityq-heap.c
src/glu/sgi/libtess/priorityq-heap.h
src/glu/sgi/libtess/priorityq-sort.h
src/glu/sgi/libtess/priorityq.c
src/glu/sgi/libtess/priorityq.h
src/glu/sgi/libtess/render.c
src/glu/sgi/libtess/render.h
src/glu/sgi/libtess/sweep.h
src/glu/sgi/libtess/tess.h
src/glu/sgi/libtess/tessmono.c
src/glu/sgi/libtess/tessmono.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/glxext.c
src/mesa/main/imports.h
src/mesa/tnl/t_vb_cliptmp.h
2007-04-20 05:37:11 +02:00
Brice Goglin
3832ecadae
Add 06_fix_texture_data_corruption.patch ( closes : #412346 )
2007-04-08 18:52:31 +02:00
Brice Goglin
285ed128ab
Add a .shlibs file for libglw1-mesa.
2007-04-01 00:44:29 +02:00
Brice Goglin
048144074b
Fix conflicts for libGLw packages.
...
libglw1-mesa does not have to conflict with earlier libgl1-mesa-swx11
(libGLw was only shipped as development libs/headers within swx11-dev).
libglw1-mesa-dev needs to conflicts with libglw-dev.
2007-04-01 00:43:20 +02:00
Brice Goglin
856ae782c7
* Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both
...
static and shared libraries, creating libglw1-mesa and libglw1-mesa-dev
(closes : #374904 ).
2007-03-31 03:28:32 +02:00
Julien Cristau
12e3f97541
Fix explanation about libglide3 in libgl1-mesa-dri's description.
...
Thanks to Michel Dänzer for his help.
2007-03-30 17:20:02 +02:00
Julien Cristau
30f6fe0710
Have libgl1-mesa-dri suggest libglide3.
...
Add explanation for this in the package description. Closes : #387339 .
2007-03-30 14:10:24 +02:00
Cyril Brulebois
0aa8f1df3c
* Non-maintainer upload.
...
* Backport a fix from mesa 6.5.2 to mesa 6.5.1 which:
- fixes braces around the ASSERT macro;
- fixes a clipping problem, which leads to systematic segfaults of the
X server (Closes : #405803 ).
2007-02-23 00:48:40 +01:00
Julien Cristau
d39147a8a1
Fix FTBFS on amd64.
...
Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override
settings in configs/linux-x86-64. This fixes a FTBFS on amd64, thanks to
Marc 'HE' Brockschmidt for the report (closes : #410118 ).
2007-02-07 23:13:59 +01:00
Julien Cristau
7991f7e936
* Add myself to Uploaders.
2007-02-04 21:17:18 +01:00
Julien Cristau
10011efcd7
Add bug closer for #409638 .
2007-02-04 17:21:57 +01:00
Julien Cristau
0058815c8f
Re-add src/glut/mini/ which was deleted by mistake.
2007-02-04 15:21:46 +01:00
Julien Cristau
02048984b7
Delete directories not included in the mesa tarballs.
2007-02-04 15:15:43 +01:00
Julien Cristau
544601e9f4
Fix FTBFS on non-i386 archs.
...
Build architecture-independant debs in binary-indep, and use the debhelper -s
option for commands in binary-arch, because architectures other than i386
don't have to build libgl1-mesa-swx11-i686.
2007-02-04 14:05:23 +01:00
Julien Cristau
2634f06c20
Merge branch 'upstream-experimental' into debian-experimental
...
Conflicts:
progs/util/README
progs/util/glstate.c
progs/util/glstate.h
progs/util/sampleMakefile
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.cc
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/interface/glcurveval.cc
src/glu/sgi/libnurbs/interface/glimports.h
src/glu/sgi/libnurbs/interface/glinterface.cc
src/glu/sgi/libnurbs/interface/glrenderer.h
src/glu/sgi/libnurbs/interface/incurveeval.cc
src/glu/sgi/libnurbs/interface/insurfeval.cc
src/glu/sgi/libnurbs/interface/mystdio.h
src/glu/sgi/libnurbs/interface/mystdlib.h
src/glu/sgi/libnurbs/internals/arc.h
src/glu/sgi/libnurbs/internals/arcsorter.cc
src/glu/sgi/libnurbs/internals/arcsorter.h
src/glu/sgi/libnurbs/internals/arctess.h
src/glu/sgi/libnurbs/internals/backend.cc
src/glu/sgi/libnurbs/internals/backend.h
src/glu/sgi/libnurbs/internals/basiccrveval.h
src/glu/sgi/libnurbs/internals/basicsurfeval.h
src/glu/sgi/libnurbs/internals/bezierarc.h
src/glu/sgi/libnurbs/internals/bin.cc
src/glu/sgi/libnurbs/internals/bin.h
src/glu/sgi/libnurbs/internals/bufpool.cc
src/glu/sgi/libnurbs/internals/bufpool.h
src/glu/sgi/libnurbs/internals/cachingeval.cc
src/glu/sgi/libnurbs/internals/cachingeval.h
src/glu/sgi/libnurbs/internals/ccw.cc
src/glu/sgi/libnurbs/internals/coveandtiler.h
src/glu/sgi/libnurbs/internals/curve.cc
src/glu/sgi/libnurbs/internals/curve.h
src/glu/sgi/libnurbs/internals/curvelist.cc
src/glu/sgi/libnurbs/internals/curvelist.h
src/glu/sgi/libnurbs/internals/curvesub.cc
src/glu/sgi/libnurbs/internals/dataTransform.cc
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/defines.h
src/glu/sgi/libnurbs/internals/displaylist.cc
src/glu/sgi/libnurbs/internals/displaylist.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/flist.cc
src/glu/sgi/libnurbs/internals/flist.h
src/glu/sgi/libnurbs/internals/flistsorter.cc
src/glu/sgi/libnurbs/internals/flistsorter.h
src/glu/sgi/libnurbs/internals/gridline.h
src/glu/sgi/libnurbs/internals/gridtrimvertex.h
src/glu/sgi/libnurbs/internals/gridvertex.h
src/glu/sgi/libnurbs/internals/hull.cc
src/glu/sgi/libnurbs/internals/hull.h
src/glu/sgi/libnurbs/internals/intersect.cc
src/glu/sgi/libnurbs/internals/jarcloc.h
src/glu/sgi/libnurbs/internals/knotvector.h
src/glu/sgi/libnurbs/internals/mapdesc.cc
src/glu/sgi/libnurbs/internals/mapdesc.h
src/glu/sgi/libnurbs/internals/mapdescv.cc
src/glu/sgi/libnurbs/internals/maplist.cc
src/glu/sgi/libnurbs/internals/maplist.h
src/glu/sgi/libnurbs/internals/mesher.cc
src/glu/sgi/libnurbs/internals/mesher.h
src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc
src/glu/sgi/libnurbs/internals/monotonizer.cc
src/glu/sgi/libnurbs/internals/monotonizer.h
src/glu/sgi/libnurbs/internals/myassert.h
src/glu/sgi/libnurbs/internals/mycode.cc
src/glu/sgi/libnurbs/internals/mystring.h
src/glu/sgi/libnurbs/internals/nurbsconsts.h
src/glu/sgi/libnurbs/internals/nurbstess.cc
src/glu/sgi/libnurbs/internals/patch.cc
src/glu/sgi/libnurbs/internals/patch.h
src/glu/sgi/libnurbs/internals/patchlist.cc
src/glu/sgi/libnurbs/internals/patchlist.h
src/glu/sgi/libnurbs/internals/pwlarc.h
src/glu/sgi/libnurbs/internals/quilt.cc
src/glu/sgi/libnurbs/internals/quilt.h
src/glu/sgi/libnurbs/internals/reader.cc
src/glu/sgi/libnurbs/internals/reader.h
src/glu/sgi/libnurbs/internals/renderhints.cc
src/glu/sgi/libnurbs/internals/renderhints.h
src/glu/sgi/libnurbs/internals/simplemath.h
src/glu/sgi/libnurbs/internals/slicer.cc
src/glu/sgi/libnurbs/internals/slicer.h
src/glu/sgi/libnurbs/internals/sorter.cc
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/internals/splitarcs.cc
src/glu/sgi/libnurbs/internals/subdivider.h
src/glu/sgi/libnurbs/internals/tobezier.cc
src/glu/sgi/libnurbs/internals/trimline.cc
src/glu/sgi/libnurbs/internals/trimline.h
src/glu/sgi/libnurbs/internals/trimregion.cc
src/glu/sgi/libnurbs/internals/trimregion.h
src/glu/sgi/libnurbs/internals/trimvertex.h
src/glu/sgi/libnurbs/internals/trimvertpool.cc
src/glu/sgi/libnurbs/internals/trimvertpool.h
src/glu/sgi/libnurbs/internals/types.h
src/glu/sgi/libnurbs/internals/uarray.cc
src/glu/sgi/libnurbs/internals/uarray.h
src/glu/sgi/libnurbs/internals/varray.cc
src/glu/sgi/libnurbs/internals/varray.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/glimports.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.cc
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.cc
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/mystdio.h
src/glu/sgi/libnurbs/nurbtess/mystdlib.h
src/glu/sgi/libnurbs/nurbtess/partitionX.cc
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.cc
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.cc
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.cc
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.cc
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.cc
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.cc
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.cc
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libtess/README
src/glu/sgi/libtess/alg-outline
src/glu/sgi/libtess/dict-list.h
src/glu/sgi/libtess/dict.c
src/glu/sgi/libtess/dict.h
src/glu/sgi/libtess/geom.c
src/glu/sgi/libtess/memalloc.c
src/glu/sgi/libtess/memalloc.h
src/glu/sgi/libtess/mesh.c
src/glu/sgi/libtess/mesh.h
src/glu/sgi/libtess/normal.h
src/glu/sgi/libtess/priorityq-heap.c
src/glu/sgi/libtess/priorityq-heap.h
src/glu/sgi/libtess/priorityq-sort.h
src/glu/sgi/libtess/priorityq.c
src/glu/sgi/libtess/priorityq.h
src/glu/sgi/libtess/render.c
src/glu/sgi/libtess/render.h
src/glu/sgi/libtess/sweep.h
src/glu/sgi/libtess/tess.h
src/glu/sgi/libtess/tessmono.c
src/glu/sgi/libtess/tessmono.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
2007-02-01 11:50:36 +01:00
Julien Cristau
7549426a16
Sync Section and Priority for all packages with the override.
2007-01-28 18:18:38 +01:00
Thierry Reding
6dcb9a3434
Give credit where credit is due.
2007-01-11 15:09:23 +01:00
Thierry Reding
e5a31c00ec
libosmesa6{,-dev} replace libgl1-mesa-swx11{,-dev} and mesa-common-dev.
...
libosmesa6 and libosmesa6-dev are now the only packages to contain OSMesa
libraries and header files so they can be installed independent of which libGL
is installed. They statically link in the software rasterization code.
2007-01-11 15:06:42 +01:00
Thierry Reding
00295242fd
mesa-common-dev needs to replace libgl1-mesa-swx11-dev and libgl1-mesa-dev.
...
The GLX headers were previously shipped in both packages and have been moved
to mesa-common-dev.
2007-01-11 14:56:48 +01:00
Thierry Reding
21b6ed7c29
Build the DRI modules with the default optimization flags.
2007-01-11 14:40:10 +01:00
Thierry Reding
01894cbf10
Revert the previous changes to the libgl1-mesa-{glx,swx11} shlibs.
2007-01-10 15:23:29 +01:00
Thierry Reding
28cad2b9d9
Bump libgl1-mesa-glx, libgl1-mesa-swx11 and libosmesa6 shlibs files.
2007-01-10 13:55:19 +01:00
Thierry Reding
71d7b7dbe7
Drop noop line.
2007-01-08 13:36:25 +01:00
Thierry Reding
4563723db1
Make sure all files in the mesa-swx11-source package have permissions 0644.
2007-01-08 13:36:16 +01:00
Thierry Reding
0bce6a1899
Compile with -O2 optimization instead of -O3 which might lead to problems.
2007-01-08 11:43:25 +01:00
Thierry Reding
e71d6dbd9c
Make debugging symbol packages depend on the corresponding binary package and
...
put them into the libdevel section.
2007-01-08 11:41:02 +01:00
Thierry Reding
132ecd19f3
Do not build any linux*-static configuration with -fPIC.
2007-01-08 10:07:08 +01:00
Thierry Reding
a404143f4c
Add patches 04_cleanup-osmesa-configs and 05_static-nonpic.
...
04_cleanup-osmesa-configs makes the OSMesa configurations behave as expected.
That is respect the OPT_FLAGS, PIC_FLAGS, ARCH_FLAGS and DEFINES variables.
The patch also makes the files more consistent by inheriting from more general
configurations.
05_static-nonpic fixes the linux-static configuration to not use -fPIC for
compiling code because it would violate Debian policy.
2007-01-08 08:35:42 +01:00
Julien Cristau
44467ca45e
* Drop obsolete depends on xlibs.
2007-01-05 15:44:51 +01:00
Julien Cristau
f70ea0747d
Import changelog entry from the 6.5.1-0.5 NMU.
2007-01-04 21:30:49 +01:00
Thierry Reding
c619abf18a
Hijack the package (set XSF as maintainer, add myself to uploaders). \o/
2007-01-04 16:35:14 +01:00
Julien Cristau
6da1323437
* Non-maintainer upload.
...
* Build with -fno-strict-aliasing to fix misbuild of i965_dri.so
(closes : #394311 ). Thanks to Michel Dänzer for the fix, and to Ryan
Richter for the report and testing.
2007-01-03 16:59:06 +01:00
Julien Cristau
1dd29785cf
Import changes from the mesa 6.5.1-0.4 NMU.
2007-01-03 13:43:46 +01:00
Julien Cristau
5681987ee4
Import changes from the mesa 6.5.1-0.3 NMU.
2007-01-03 13:41:57 +01:00
Thierry Reding
6eeb18fc68
Build the i915tex DRI module on the i386 and amd64 architectures.
2006-12-05 00:45:42 +00:00
Thierry Reding
01c90575b4
Add missing changelog entry and bug closer.
2006-12-04 07:23:14 +00:00
Thierry Reding
32e9cb0275
Update to new upstream release (6.5.2).
2006-12-02 23:46:07 +00:00
Thierry Reding
017bade93c
Update to latest upstream release candidate (6.5.2 RC3).
2006-12-01 00:16:33 +00:00
Thierry Reding
c9c79e7cae
Add manpages to the mesa-utils package.
2006-11-29 18:07:26 +00:00
Thierry Reding
777d41dd07
Mark the latest changelog entries as NMUs.
2006-11-26 02:40:01 +00:00
Thierry Reding
6238c30913
Revert maintainer and uploaders fields. Integrate latest NMUs into the
...
changelog and be a little more verbose in the debian/rules rewrite
changelog entries.
2006-11-26 02:38:31 +00:00
Thierry Reding
db164ab514
Update to latest upstream release candidate.
2006-11-22 19:50:34 +00:00
Thierry Reding
c72ef17731
Add libOSMesa16 and libOSMesa32 entries to libosmesa6.shlibs so packages
...
linking against those libraries will get the correct dependencies.
2006-11-22 19:47:56 +00:00
Thierry Reding
8dbee7867f
Use the new upstream minstall utility to install files and directories. Using
...
/usr/bin/install would result in a symlink's target being copied instead of
the symlink.
2006-11-18 21:28:07 +00:00
Thierry Reding
f403108f5f
Fix typo in changelog. libdrm2-dev is not a package.
2006-11-18 21:22:52 +00:00
Thierry Reding
223a97f92a
Bump build-dependency on libdrm-dev (>= 2.2.0).
2006-11-18 21:21:18 +00:00
Thierry Reding
bb44a8ae1f
Update to latest upstream release candidate.
...
Update patches.
2006-11-18 17:59:25 +00:00
Thierry Reding
b5a5062176
Target the mesa package at experimental until etch is released.
2006-11-18 17:50:44 +00:00
Thierry Reding
50faa32ce3
Move the code to choose which configurations to build to a separate script in
...
order to keep debian/rules cleaner.
2006-11-10 09:00:00 +00:00
Thierry Reding
b6caed527c
Also add release notes of version 6.5.1 and the release notes index.
2006-11-10 08:50:35 +00:00
Thierry Reding
d5ef77353b
Build Mesa utility programs (glxdemo, glxgears, glxheads, glxinfo) together
...
with the DRI/GLX-enabled libGL. Don't build the utilities on CPU-optimized
configurations.
2006-11-10 08:40:03 +00:00
Thierry Reding
336beba81b
Update Debian changelog.
2006-11-02 21:20:33 +00:00
Thierry Reding
5d23a7905c
Add code to provide a mesa-utils package since those utilities are shipped in
...
the MesaDemos tarball.
2006-11-02 21:05:29 +00:00
Thierry Reding
143dfcc904
Make mesa-common-dev depend on libx11-dev to provide Xlib.h and Xutil.h needed
...
by the GLX headers.
2006-11-01 07:54:40 +00:00
Thierry Reding
e076cd42f0
Bug #387706 should also be closed because we move libOSMesa to libosmesa6 and
...
statically link in the software rasterization code.
2006-10-25 00:17:42 +00:00
Thierry Reding
5bed38974e
Close 392715 because we now ship the contents of the three Mesa tarballs in
...
the original source.
2006-10-24 14:45:18 +00:00
Thierry Reding
35bc4b82ff
Since the original tarball is repackaged to include the three upstream
...
tarballs (MesaDemos, MesaGLUT and MesaLib), remove files that are not supposed
to be there.
Note that when importing initially, some files were not even added to the SVN
repository because SVN ignored them. These were configs/diffs~ and
docs/RELNOTES-6.1~. I removed those from the tarball as well.
2006-10-24 14:33:30 +00:00
Thierry Reding
4e5d870f72
Make libosmesa6-dev binNMU-safe again (mesa-common-dev is Architecture: all).
2006-10-24 14:29:11 +00:00
Thierry Reding
83def94db5
Make libgl1-mesa-dev Architecture: all, because all we ship with it is a
...
symbolic link. Make it binNMU-safe by making it depend on libgl1-mesa-glx and
libgl1-mesa-dri both >= ${Source-Version} instead of exact versions.
Add packages containing debugging symbols for libgl1-mesa-swx11,
libgl1-mesa-glx and libgl1-mesa-dri.
2006-10-24 12:16:16 +00:00
Thierry Reding
9d74c1ef2a
-fno-strict-aliasing actually *does* fix #394311 according to the submitter.
2006-10-24 10:31:28 +00:00
Thierry Reding
6023d4bdb5
Build with -fno-strict-aliasing, which should fix bug #394311 .
2006-10-24 10:29:21 +00:00
Thierry Reding
5e38f566f2
Provide libgl-dev as alternative to the mesa-common-dev dependency of the
...
libosmesa6-dev package.
2006-10-23 16:45:00 +00:00
Thierry Reding
b57341a78b
Move the glx*.h headers from libgl1-mesa(-swx11)-dev into mesa-common-dev
...
because both packages provide identical files.
2006-10-23 16:43:41 +00:00
Thierry Reding
910c32c0e9
Install the osmesa.h header in the libosmesa6-dev package where it belongs,
...
now that all OSMesa libraries have been split off into libosmesa6{,-dev}.
Don't make libosmesa6-dev depend on libgl1-mesa-swx11-dev anymore because it
no longer needs a libGL, only the gl.h header provided by mesa-common-dev.
2006-10-23 16:02:22 +00:00
Thierry Reding
e49456d8d8
Don't force -fPIC everywhere, because it seems only unused on x86 which we
...
build with assembler optimizations by default, resulting in non-PIC libraries
anyway.
2006-10-23 14:40:10 +00:00
Thierry Reding
c46becc9b3
Move the libOSMesa shlibs entry from libgl1-mesa-swx11 to libosmesa6 because
...
that's where libOSMesa is now installed.
2006-10-23 08:30:53 +00:00
Thierry Reding
b6e637106f
Add the static libGLw and the corresponding headers to the
...
libgl1-mesa-swx11-dev package again.
2006-10-23 08:23:27 +00:00
Thierry Reding
787cffe3d0
Always force -fPIC.
2006-10-23 08:22:25 +00:00
Thierry Reding
9d914e6809
Make sure the install-source.sh script is executable before trying to run it.
2006-10-20 20:56:41 +00:00
Thierry Reding
4e183c66e9
Add comments to patches and enable the previously disabled patches.
2006-10-20 19:41:00 +00:00
Thierry Reding
b1630fcbe8
Add build-dependency on lesstif2-dev needed to build the GLw libraries.
2006-10-20 19:17:34 +00:00
Thierry Reding
cd44f730cc
Enable building the GLw libraries.
2006-10-20 19:07:36 +00:00
Thierry Reding
ce5a39559e
Install several documents from the docs subdirectory into the mesa-common-dev
...
package.
2006-10-20 17:51:36 +00:00
Thierry Reding
ccffaef603
Build architecture-specific static libraries where available.
2006-10-20 12:15:29 +00:00
Thierry Reding
ae41f3a3ee
Don't make libgl1-mesa-swx11-dev depend on lesstif2-dev anymore because we
...
don't ship anything related to LessTif in that package.
2006-10-20 12:06:20 +00:00
Thierry Reding
c7e576d6bf
No longer install the default build of libOSMesa in the libgl1-mesa-swx11
...
package, but in the libosmesa6 package.
Modify the 01_fix-makefile patch to not build libOSMesa on stand-alone builds,
so that it is only created when building OSMesa explicitly.
Build libOSMesa with 8 bits per color channel (the default) in dynamic and
static versions separately from the software rasterization libGL with the
software rasterization code linked in statically so that libOSMesa can run in
parallel with any libGL. This should fix the problem Yann Dirson mentioned a
while ago.
Use the install-source.sh script to install the Mesa sources needed for the
mesa-swx11-source package instead of doing it in the debian/rules file itself.
2006-10-20 07:56:11 +00:00
Thierry Reding
f069b2812e
Add a set of files to enable an i686 optimized build of the DRI/GLX-enabled
...
libGL and the DRI drivers. Disabled for now.
2006-10-20 07:47:37 +00:00
Thierry Reding
f20ff6213e
Add a shell script to install the Mesa sources for the mesa-swx11-source
...
package.
2006-10-20 07:45:39 +00:00
Thierry Reding
24ff74bdcb
Add configurations to build static versions of the default OSMesa library.
...
In all Debian-specific configurations, include the Debian defaults
configuration after the Mesa configurations and drop the 'override' for all
variables because it is no longer needed.
2006-10-20 07:43:50 +00:00
Thierry Reding
230e79916f
Merge in the old Debian changelog entries and the old copyright file.
2006-10-17 19:35:35 +00:00
Thierry Reding
9f14b4db35
Use -march in favor of the deprecated -mcpu.
2006-10-17 19:13:27 +00:00
Thierry Reding
ec916398e7
Don't install libOSMesa development files in the libgl1-mesa-swx11 package.
2006-10-16 14:43:43 +00:00
Thierry Reding
6befad112e
Actually do rename debian-static to debian-swx11+glu-static.
2006-10-16 13:54:24 +00:00
Thierry Reding
55ce23b8db
Beautify IEEE floating point patch.
2006-10-16 13:34:57 +00:00
Thierry Reding
1292ec1ecf
Fix typo in the filename of the IEEE FP on s390 and m68k patch.
2006-10-16 13:11:51 +00:00
Thierry Reding
65a324062f
Add patches extracted from older Debian diffs but not applied yet because it's
...
not certain yet that they are needed.
2006-10-16 13:05:42 +00:00
Thierry Reding
c9db617e0b
Make the debian-static a subclass of debian-swx11+glu-default, because that's
...
what it actually is. Rename it accordingly and add it to SWX11_GLU_CONFIGS.
Install the libOSMesa.so symlink and the libOSMesa static library in the
libgl1-mesa-swx11-dev package.
Add .shlibs files for the libgl1-mesa-swx11, libgl1-mesa-glx and libglu1-mesa
packages.
2006-10-16 13:04:29 +00:00
Thierry Reding
b43137d0cc
Build libGLU by default for swx11+glu configurations but not in the
...
configurations targetting specific CPU's because it is unlikely to result in
an increase in performance.
2006-10-16 11:53:06 +00:00
Thierry Reding
eeca642778
Add versioned build-dependency on dpkg-dev (>= 1.13.19) to make sure the
...
binary:Version and source:Version substitution variables can be used.
2006-10-16 11:49:46 +00:00
Thierry Reding
5cef6ca36a
Move the detection of architecture-specific configurations to the debian/rules
...
file.
Add the configs target to debian/rules for checking whether the correct
configurations will be built.
2006-10-16 10:03:32 +00:00
Thierry Reding
be2b518f7b
Also build a static version of libGLU.
2006-10-16 09:53:30 +00:00
Thierry Reding
1b0d29afbc
Rename the CPU optimization configurations to make it clear that they only
...
build swx11 and GLU.
Build architecture-optimized swx11 and GLU where possible.
2006-10-16 09:39:59 +00:00
Thierry Reding
55cf480c0b
Drop the libgl1-mesa-swx11-dbg package until there's a decision as to whether
...
it is really needed.
Allow more than one type of optimization libraries to be built for any given
architecture. Currently optimization configurations are provided for i386
[i686], alpha [ev5], amd64, powerpc [603], ppc64 and sparc [ultrasparc].
However, only i686 and amd64 are enabled for now for safety.
Add the libgl1-mesa-swx11-i686 for i686 optimized libraries.
Drop the debian-common configuration because it is no longer used.
Don't build libGLU in all configurations, only when needed.
2006-10-16 08:58:05 +00:00
Thierry Reding
84db6912f0
Add missing build-dependencies.
2006-10-15 18:02:33 +00:00
Thierry Reding
7495cc28a0
Only build the i810, i915, i965, sis and unichrome DRI drivers on i386 and
...
amd64.
Only build the ffb DRI driver on sparc.
2006-10-15 16:17:53 +00:00
Thierry Reding
87744f786b
Use STAMP_DIR consistently throughout the debian/rules file.
...
Make the BUILD_STAMPS targets depend on patch so that when they are built
separately the patches will also be applied. Thanks to Michel Dänzer for
catching this.
Make symlinking the source tree idempotent by adding the -f option to cp.
Thanks again Michel Dänzer.
2006-10-15 14:41:12 +00:00
Thierry Reding
5bcfa4c859
Build only optimized versions of the DRI drivers, only using no optimizations
...
when not supported.
Add configuration to build the DRI drivers on amd64.
2006-10-15 13:30:22 +00:00
Thierry Reding
8ef731bcd1
Add a patch (00_create-libdir) that fixes the upstream build system to make
...
sure the LIB_DIR is created or bail out.
Update the 01_fix-makefile patch to only install libGL/libOSMesa if they
exist. Don't make installation dependent on which drivers are built.
Build optimized versions of the swx11 libraries in addition to those that
should work on the least-capable supported processor for the given
architecture.
Have most configurations include debian-default instead of debian-common so
that INSTALL_DIR is correctly defined. debian-common can probably be dropped
anyway.
2006-10-15 13:15:56 +00:00
Thierry Reding
8d02f3c68a
Add patch to fix upstream build system to correctly install libOSMesa and
...
variants. This patch also fixes the build system not to install libGL if only
the OSMesa library is built.
Update *.install files to install more files. Pretty much everything except
debugging and optimized libraries is now built and installed.
Enable building static libraries for inclusion in the -dev packages.
2006-10-15 00:49:41 +00:00
Thierry Reding
b1f8b49e8b
Add build-dependency on quilt.
...
Remove shlibs:Depends substitution variable from -dev packages, which doesn't
make sense.
2006-10-15 00:42:25 +00:00
David Nusinow
75733e4237
Commit diff of 6.5.1-0.2 so we've got a record of it here.
2006-10-14 22:42:57 +00:00
Thierry Reding
6e318e2cd1
Base the Debian OSMesa configurations on linux-osmesa* provided upstream.
...
Add a configuration for building a static version of OSMesa with 32 bits per
color channel.
2006-10-14 17:04:02 +00:00
Thierry Reding
01e6b84b14
Fix some small inconsistencies involving configuration names.
2006-10-14 16:32:25 +00:00
Thierry Reding
69705d22be
Rename the debian-dri-common configuration to debian-dri-default, to make it
...
consistent with the naming scheme of debian-default.
2006-10-14 16:29:32 +00:00
Thierry Reding
b16d1dcff5
Add a default Debian-specific configuration which overrides settings from the
...
default Mesa configuration.
2006-10-14 16:28:45 +00:00
Thierry Reding
10c5b5d5ba
Comment the Debian-specific configurations.
2006-10-14 16:25:30 +00:00
Thierry Reding
d9c5c170f6
Rename the -default configurations to -any, which is a more appropriate name.
2006-10-14 15:44:15 +00:00
Thierry Reding
32c7138d86
Move the debian/debian-dri configurations to debian-default/debian-dri-default
...
respectively, and use debian/debian-dri to choose an architecture specific
configuration.
2006-10-14 15:42:59 +00:00
Thierry Reding
d29244d872
Add OSMesa configurations and made fixed several issues here and there.
2006-10-14 15:11:31 +00:00
Thierry Reding
0fca6eda1e
Initial version of a new build system for Mesa.
2006-10-14 04:33:41 +00:00
Thierry Reding
1ddf606332
Import Mesa 6.5.1 (MesaLib, MesaDemos, MesaGLUT).
2006-10-14 03:46:41 +00:00
David Nusinow
bc8084da74
Fix goofed patch from before
2006-09-26 01:36:37 +00:00
David Nusinow
5eed400862
Prepare changelog for release
2006-09-26 01:21:59 +00:00
David Nusinow
a37a0959ac
* Add patch from Cyril Brulebois to allow package to build on HURD, which
...
lacks DRI and directfb. This includes not using lib-directfb in the
build-depends for hurd-i386. It also creates a new debian config,
debian-indirect, which is used when building for HURD. This config is
invoked in the debian-dri config on hurd-i386. Thanks to Cyril Brulebois
for the patch, Michael Banck, Michel Dänzer, and Samuel Thibault for
input on an appropriate fix. (closes : #358065 )
2006-09-26 00:46:14 +00:00
David Nusinow
53845c52e5
* Re-add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h. This
...
package seriously needs to store patches somewhere that are easy to find
and re-apply.
2006-09-26 00:32:06 +00:00
David Nusinow
d429f0b14f
* Make sure that libGl looks for the dri drivers in the proper location. Do
...
this by setting the appropriate variables in the debian config
2006-09-25 02:57:24 +00:00
David Nusinow
02339187ad
* Stuff not in the upstream tarballs
...
* Bump libdrm-dev build-dep to >= 2.0.2
* Add libdrm cflags to the debian-dri config. This allows the build system
to find drm.h
2006-09-24 22:55:41 +00:00
David Nusinow
827f778525
* Stuff not in the upstream tarballs
...
+ os2 glut stuff
+ docs/gears.png
2006-09-24 21:54:25 +00:00
David Nusinow
d3fc85eea9
Remove os2 glut stuff. It's not in the tarballs
2006-09-24 21:50:01 +00:00
David Nusinow
9a62963129
Add glut
2006-09-24 21:40:02 +00:00
David Nusinow
a0b2543ba1
Add mesa demos
2006-09-24 21:29:21 +00:00
David Nusinow
387acaac69
* New upstream version
2006-09-24 21:21:15 +00:00
David Nusinow
952b775dbe
Rename mesa dir
2006-09-24 21:18:17 +00:00
David Nusinow
eadb76b3f8
Bump to latest mesa in Debian
2006-09-24 21:11:46 +00:00
Steve Langasek
b3f7313ae4
Nuke the directory for an obsolete version of mesa -- no reason to merge
...
it anywhere, it's already superseded
2006-09-18 23:49:49 +00:00
David Nusinow
0c97d48027
* Install the glx sources with the rest in the sources package. This will
...
allow building of Xgl
2006-04-08 18:28:29 +00:00
David Nusinow
c4a678de9e
Update source package install file, change version number to match reality, and note NMU in changelog
2006-04-07 06:36:53 +00:00
David Nusinow
2c834f4d29
* Don't build now non-existant i830 driver in debian dri configs. Fixes
...
FTBFS.
2006-04-07 03:11:47 +00:00
David Nusinow
b93d290c9f
* Remove set_buffer function from idirectfbgl_mesa.c in directfb driver.
...
Also remove the line that sets SetBuffer to it. Fixes FTBFS.
2006-04-07 02:22:22 +00:00
David Nusinow
32266bb21a
* Re-Add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h.
...
I need to submit this upstream.
2006-04-07 01:50:23 +00:00
David Nusinow
cab39103b7
* Increment libdrm-dev build-dep to 2.0.1
2006-04-07 00:38:00 +00:00
David Nusinow
5c56a80ac9
Copy over Debian packaging from 6.4.1
2006-04-07 00:35:30 +00:00
David Nusinow
d0bac31721
Copy vendor drop of Mesa 6.5 over to working branch
2006-04-07 00:30:49 +00:00
David Nusinow
9258e54cfa
Move incorrect vendor drop of Mesa 6.5
2006-04-07 00:29:08 +00:00
David Nusinow
ccb68495e0
Vendor drop of Mesa 6.5
2006-04-07 00:24:21 +00:00
David Nusinow
db4236fe0b
* Add versioned conflict between libgl1-mesa-dri and xlibmesa-dri so that
...
the xlibmesa-dri transitional upgrade package works
2006-03-07 02:48:44 +00:00
David Nusinow
a4e43427f8
* Move compatibility packages to the xorg source package. The versioning on
...
these packages will be too low without an epoch and they definitely fit
with the xorg package anyway.
2006-02-24 05:43:01 +00:00
David Nusinow
829190abdd
* Provide compatibility packages for the Xorg 6.9 mesa packages. This
...
package will be the only source of mesa packages in Debian for the
present, and these packages will provide for smooth upgrades and
compatibility.
2006-02-22 03:22:26 +00:00
David Nusinow
99688cd051
Add m68k to previous fix to fix its FTBFS also
2006-02-11 23:00:27 +00:00
David Nusinow
1ba0a92702
* Add s390 to the USE_IEEE test in src/mesa/main/imports.h.
...
(closes : #349437 )
2006-02-09 01:24:52 +00:00
David Nusinow
065d5a8d17
* Remove makedepend from build-depends. Now we'll just build-dep on xutils
...
to get the app, which will translate over to our own xorg 7.0 plans.
2006-02-01 00:22:24 +00:00
David Nusinow
3b53c0ac19
* Re-add dh_installdirs call to binary-indep target so that we get
...
arch-specific dirs for the mesa-swx11-source package
2006-01-30 04:02:11 +00:00
David Nusinow
ed56fe4e82
* mesa-swrast-src.install stop looking for the swx11 dir and look for swrast
2006-01-22 19:50:19 +00:00
David Nusinow
1fbbe807ed
Make libglu1-mesa default to depending on libgl1-mesa-glx. Thanks Michel Dänzer for catching this one.
2006-01-22 00:07:07 +00:00
David Nusinow
c3dccfa05b
Use appropriate version number for an NMU. Thanks Julien for catching this one
2006-01-21 23:40:34 +00:00
David Nusinow
7703d9293f
Incorporate other NMU for xlibs-dev transition
2006-01-21 23:32:52 +00:00
David Nusinow
bcf560e4b8
* Change libgl1-mesa to be named libgl1-mesa-glx
2006-01-19 23:45:36 +00:00
David Nusinow
9d944b501a
* Change libgl1-mesa-swrast to be named libgl1-mesa-swx11
2006-01-16 22:19:03 +00:00
David Nusinow
cf013a5384
Add more closers
2006-01-11 04:10:39 +00:00
David Nusinow
2f367491c4
Add closer
2006-01-11 04:00:15 +00:00
David Nusinow
e7d93b62ec
* Change libgl1-mesa-swrast Depends on libx11-6-dev to libx11-dev.
...
(closes : #347205 )
* Add closer for packaging new upstream
2006-01-11 03:48:31 +00:00
David Nusinow
a5b309c0c9
Document that we'll be NMU'ing this for modular work
2006-01-06 03:09:12 +00:00
David Nusinow
df46b96ab0
Re-add mesa-6.4.1 which was accidentally deleted
2006-01-03 05:15:27 +00:00
David Nusinow
bda1e332ce
Update libs to 7.0 release with packaging
2005-12-30 20:12:45 +00:00
David Nusinow
53b2ad5fd0
Rename mesa lib dir to appropriate version
2005-12-16 04:04:38 +00:00
David Nusinow
b44d9c657d
Changelog version bump
2005-12-16 04:03:27 +00:00
David Nusinow
92ef7527d1
* New upstream version (6.4.1)
...
* Merge changes from Ubuntu version 6.4.1-0ubuntu1
+ Add new files required by xorg-server GL build to mesa-swrast-source.
2005-12-14 01:43:13 +00:00
David Nusinow
c37d6b4ca8
Commit Mesa 6.4 sources and packaging
2005-11-09 02:46:07 +00:00