mesa.git
13 years agoosmesa: Fix missing symbols when GLX_INDIRECT_RENDERING is defined.
Jeremy Huddleston [Tue, 7 Jun 2011 04:51:18 +0000 (00:51 -0400)]
osmesa: Fix missing symbols when GLX_INDIRECT_RENDERING is defined.

When GLX_INDIRECT_RENDERING is defined, some symbols are used in
libglapi.a but are not defined.  Define them through the help of
glapitemp.h.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
13 years agoapple: Update dispatch table to current OpenGL specs
Jeremy Huddleston [Wed, 8 Jun 2011 04:21:47 +0000 (21:21 -0700)]
apple: Update dispatch table to current OpenGL specs

This updates the apple dispatch table to match the current glapi.
Aliases are still not handled very well.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Dead code removal
Jeremy Huddleston [Wed, 8 Jun 2011 02:35:09 +0000 (19:35 -0700)]
apple: Dead code removal

Now that we're using glapi, all of this is no longer needed.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Remove apple_glx_get_proc_address
Jeremy Huddleston [Wed, 8 Jun 2011 02:26:53 +0000 (19:26 -0700)]
apple: Remove apple_glx_get_proc_address

Now that we're using glapi, we don't need to special case this.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Use glapi rather than reinventing the wheel
Jeremy Huddleston [Wed, 8 Jun 2011 01:51:17 +0000 (18:51 -0700)]
apple: Use glapi rather than reinventing the wheel

With this change, Apple's libGL is now using glapi rather than implementing
its own dispatch.  In this implementation, two dispatch tables are created:

__ogl_framework_api always points into OpenGL.framework.
__applegl_api is the vtable that is used.  It points into OpenGL.framework
or to local implementations that override / interpose this in OpenGL.framework

The initialization for __ogl_framework_api was copied from XQuartz with some
modifications and probably still needs further edits to better deal with
aliases.

This is a good step towards supporting both indirect and direct rendering
on darwin.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Rename __gl_api to __ogl_framework_api
Jeremy Huddleston [Wed, 8 Jun 2011 01:00:23 +0000 (21:00 -0400)]
apple: Rename __gl_api to __ogl_framework_api

In starting the migration to using mapi, rename __gl_api to
__ogl_framework_api since it is a vtable for OpenGL.framework

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agor600g: missed one line in eg dyn gpr fallback.
Dave Airlie [Wed, 8 Jun 2011 04:52:30 +0000 (14:52 +1000)]
r600g: missed one line in eg dyn gpr fallback.

need more sleep or something.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: set enable always bits for r600/r700 sq registers.
Dave Airlie [Wed, 8 Jun 2011 04:25:02 +0000 (14:25 +1000)]
r600g: set enable always bits for r600/r700 sq registers.

This makes sure these are enabled even if set to 0 at startup.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: condition evergreen dyn gpr resource management
Dave Airlie [Wed, 8 Jun 2011 04:45:31 +0000 (14:45 +1000)]
r600g: condition evergreen dyn gpr resource management

So only with kernel version 2.7 can this work, thanks to Alex
for pointing that out. Also add a workaround for a hw bug.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: fix warnings in winsys.
Dave Airlie [Wed, 8 Jun 2011 04:10:49 +0000 (14:10 +1000)]
r600g: fix warnings in winsys.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: enable dynamic GPR resource management on evergreen
Dave Airlie [Wed, 8 Jun 2011 04:09:59 +0000 (14:09 +1000)]
r600g: enable dynamic GPR resource management on evergreen

Evergreen can do this as well as cayman, so we should enable it.

This fixes a gpu lockup with
glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test

I need to add a better workaround for r600/r700.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: only add blocks once to the dirty/enabled lists.
Dave Airlie [Wed, 8 Jun 2011 04:02:00 +0000 (14:02 +1000)]
r600g: only add blocks once to the dirty/enabled lists.

This caused a loop in some tests.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: fix regression in recent state changes.
Dave Airlie [Wed, 8 Jun 2011 03:20:17 +0000 (13:20 +1000)]
r600g: fix regression in recent state changes.

We weren't emitting the SQ setup regs at all which really is
fail.

When a state is always enabled we need to add it to the dirty list
as well.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: move simple part of bo reloc processing inline.
Dave Airlie [Tue, 7 Jun 2011 05:40:20 +0000 (15:40 +1000)]
r600g: move simple part of bo reloc processing inline.

This just moves the messy stuff out of the fast path,
and leaves the fast-case in the fast path.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: take alpha ref update out of line.
Dave Airlie [Tue, 7 Jun 2011 05:39:29 +0000 (15:39 +1000)]
r600g: take alpha ref update out of line.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: split resource emit path from main register emit path
Dave Airlie [Tue, 7 Jun 2011 03:21:02 +0000 (13:21 +1000)]
r600g: split resource emit path from main register emit path

Since resources don't generally vary in size, this splits
the emit path, it also takes into a/c that texture and vertex resources
have different number of relocs, and avoids emitting the extra
reloc for vertex resources.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: exit bo per reg scanning loop early.
Dave Airlie [Tue, 7 Jun 2011 02:33:24 +0000 (12:33 +1000)]
r600g: exit bo per reg scanning loop early.

Exit this loop early to avoid pointless iterations later.

Move the resource bos to the first two regs, it actually
doesn't matter which regs we use for this in resource land.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: reorder evergreen draw packets to be smaller.
Dave Airlie [Tue, 7 Jun 2011 01:30:47 +0000 (11:30 +1000)]
r600g: reorder evergreen draw packets to be smaller.

We were always re-emitting lots of unnecessary changes here,
avoid doing that.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: inline r600_bo_reference.
Dave Airlie [Tue, 7 Jun 2011 01:03:59 +0000 (11:03 +1000)]
r600g: inline r600_bo_reference.

This relies on the reference member being first, so document it.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: no need to drop the references here.
Dave Airlie [Tue, 7 Jun 2011 00:49:50 +0000 (10:49 +1000)]
r600g: no need to drop the references here.

We drop them when we reference the new objects in the next line.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: use memcmp instead of a loop in state_set_resource
Dave Airlie [Tue, 7 Jun 2011 00:38:46 +0000 (10:38 +1000)]
r600g: use memcmp instead of a loop in state_set_resource

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agomesa: Ignore blits to/from missing buffers
Ian Romanick [Tue, 7 Jun 2011 19:38:39 +0000 (12:38 -0700)]
mesa: Ignore blits to/from missing buffers

The EXT_framebuffer_object spec (and later specs) say:

     "If a buffer is specified in <mask> and does not exist in both
     the read and draw framebuffers, the corresponding bit is silently
     ignored."

Check for color, depth, and stencil that the source and destination
FBOs have the specified buffers.  If the buffer is missing, remove the
bit from the blit request mask and continue.

Fixes the crash in piglit test 'fbo-missing-attachment-blit from', and
fixes 'fbo-missing-attachment-blit es2 from'.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37739
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
NOTE: This is a candidate for the stable branches.

13 years agomesa: Don't try to clear a NULL renderbuffer
Ian Romanick [Tue, 7 Jun 2011 19:27:04 +0000 (12:27 -0700)]
mesa: Don't try to clear a NULL renderbuffer

In an ES2 context (or if GL_ARB_ES2_compatibility) is supported, the
framebuffer can be complete with some attachments be missing.  In this
case the _ColorDrawBuffers pointer will be NULL.

Fixes the crash in piglit test fbo-missing-attachment-clear.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37739
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
NOTE: This is a candidate for the stable branches.

13 years agomga: enable GL_ARB_vertex_array_object extension
Nicolas Kaiser [Tue, 7 Jun 2011 21:56:03 +0000 (23:56 +0200)]
mga: enable GL_ARB_vertex_array_object extension

Tested on a Matrox G550 AGP.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agoegl_dri2: Add missing header
Benjamin Franzke [Tue, 7 Jun 2011 20:19:21 +0000 (22:19 +0200)]
egl_dri2: Add missing header

13 years agoegl_dri2: Add missing license
Benjamin Franzke [Tue, 7 Jun 2011 20:15:32 +0000 (22:15 +0200)]
egl_dri2: Add missing license

13 years agoegl_dri2: Use libudev only if available
Benjamin Franzke [Tue, 7 Jun 2011 19:59:02 +0000 (21:59 +0200)]
egl_dri2: Use libudev only if available

Broken since 7f881c43dfb4f1aeeab3a84125b5c106c191a43f.

13 years agor600g : fix incorrect size computation in r600_query_result
Pierre-Eric Pelloux-Prayer [Tue, 7 Jun 2011 21:40:37 +0000 (17:40 -0400)]
r600g : fix incorrect size computation in r600_query_result

query->num_results already has the size in dwords of the query
buffer.  There no need to multiply again.  We were reading past
the end of the buffer, resulting in reading garbage.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=37028

agd5f: clarify the comment.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
13 years agor600g: remove pre-r6xx asic families and pci ids
Alex Deucher [Tue, 7 Jun 2011 20:59:04 +0000 (16:59 -0400)]
r600g: remove pre-r6xx asic families and pci ids

Not sure why these were included originally.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
13 years agor600g: always clear query memory
Alex Deucher [Tue, 7 Jun 2011 20:44:40 +0000 (16:44 -0400)]
r600g: always clear query memory

According to the hw documentation, the driver needs to:
- allocate 128 bits for each possible DB
- clear the 128 bits for each possible DB
- write 1 to bits 127 and 63 for upper DBs that don't
exist on a particular asic

Previously we were only doing these steps if the
asic had less than the max possible DBs.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
13 years agor300g: consolidate deducing chipset info
Marek Olšák [Tue, 7 Jun 2011 18:59:56 +0000 (20:59 +0200)]
r300g: consolidate deducing chipset info

Use the new PCI ID table, make it simpler.

13 years agor300_pci_ids: set families to match r300g
Marek Olšák [Tue, 7 Jun 2011 18:50:32 +0000 (20:50 +0200)]
r300_pci_ids: set families to match r300g

13 years agor600g: add missing r300 families
Marek Olšák [Tue, 7 Jun 2011 18:51:03 +0000 (20:51 +0200)]
r600g: add missing r300 families

Wondering why r600g needs to include r300_pci_ids.h

13 years agointel: Update intel-decode.c from intel-gpu-tools.
Eric Anholt [Mon, 6 Jun 2011 06:05:20 +0000 (23:05 -0700)]
intel: Update intel-decode.c from intel-gpu-tools.

13 years agointel: Implement glFinish() correctly by waiting on all previous rendering.
Eric Anholt [Tue, 31 May 2011 19:32:06 +0000 (12:32 -0700)]
intel: Implement glFinish() correctly by waiting on all previous rendering.

Before, we were waiting for (most of) the current framebuffer to be
done, which is not quite the same thing.

13 years agodarwin: Fix VG_LIB_GLOB to also match the unversioned symlink
Jeremy Huddleston [Tue, 7 Jun 2011 17:07:26 +0000 (13:07 -0400)]
darwin: Fix VG_LIB_GLOB to also match the unversioned symlink

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agodarwin: Don't link against libGL when building libOSMesa
Jeremy Huddleston [Tue, 7 Jun 2011 17:06:44 +0000 (13:06 -0400)]
darwin: Don't link against libGL when building libOSMesa

Everything should be resolved through glapi.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agor300_pci_ids: add missing 4B48
Marek Olšák [Tue, 7 Jun 2011 16:45:23 +0000 (18:45 +0200)]
r300_pci_ids: add missing 4B48

Found in r300_chipset.h.

13 years agor300g: Remove is_r3xx
Benjamin Franzke [Mon, 6 Jun 2011 16:31:12 +0000 (18:31 +0200)]
r300g: Remove is_r3xx

Use r300_pci_ids.h instead.

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
13 years agor600g: Use radeon pciid list for the family lookup table
Benjamin Franzke [Mon, 6 Jun 2011 11:13:01 +0000 (13:13 +0200)]
r600g: Use radeon pciid list for the family lookup table

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
13 years agoradeon: Use pciid list to generate PCI_CHIP_<FAMILY>_<ID> defines
Benjamin Franzke [Mon, 6 Jun 2011 11:12:26 +0000 (13:12 +0200)]
radeon: Use pciid list to generate PCI_CHIP_<FAMILY>_<ID> defines

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
13 years agotargets/egl: Support driver name lookup using pci lists
Benjamin Franzke [Mon, 30 May 2011 07:55:14 +0000 (09:55 +0200)]
targets/egl: Support driver name lookup using pci lists

Make use of this in drm and wayland st/egl backends.

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
13 years agoegl_dri2: Use external driver pci list
Benjamin Franzke [Mon, 30 May 2011 08:49:55 +0000 (10:49 +0200)]
egl_dri2: Use external driver pci list

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
13 years agoAdd radeon pci id lists
Benjamin Franzke [Thu, 26 May 2011 12:54:38 +0000 (14:54 +0200)]
Add radeon pci id lists

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
13 years agoAdd intel pci id lists
Benjamin Franzke [Mon, 30 May 2011 09:58:32 +0000 (11:58 +0200)]
Add intel pci id lists

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
13 years agotgsi: s/varient/variant/
Brian Paul [Tue, 7 Jun 2011 13:57:04 +0000 (07:57 -0600)]
tgsi: s/varient/variant/

13 years agodraw: rename draw_vs_varient.c to draw_vs_variant.c
Brian Paul [Tue, 7 Jun 2011 13:55:06 +0000 (07:55 -0600)]
draw: rename draw_vs_varient.c to draw_vs_variant.c

13 years agodraw/llvm: whitespace, formatting fixes
Brian Paul [Tue, 7 Jun 2011 13:31:34 +0000 (07:31 -0600)]
draw/llvm: whitespace, formatting fixes

13 years agodraw: s/1/TRUE/
Brian Paul [Mon, 6 Jun 2011 20:33:05 +0000 (14:33 -0600)]
draw: s/1/TRUE/

13 years agoi965: Fix flipped GT1 vs GT2 URB VS entry count limits.
Eric Anholt [Mon, 6 Jun 2011 06:20:57 +0000 (23:20 -0700)]
i965: Fix flipped GT1 vs GT2 URB VS entry count limits.

13 years agoMerge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
Stéphane Marchesin [Tue, 7 Jun 2011 03:42:30 +0000 (20:42 -0700)]
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa

13 years agoi915g: Do generic remapping.
Stéphane Marchesin [Tue, 7 Jun 2011 03:40:16 +0000 (20:40 -0700)]
i915g: Do generic remapping.

With complex shaders there are often "holes" in the fs inputs, and we only
have 8 tex coorsd to map those to. To fix this, we remap fs inputs to [0..8].
This lets us to run many more GLSL programs.

13 years agodarwin: Set VG_LIB_{NAME,GLOB} to fix make install
Jeremy Huddleston [Mon, 6 Jun 2011 23:54:55 +0000 (19:54 -0400)]
darwin: Set VG_LIB_{NAME,GLOB} to fix make install

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agor600g: optimise the draw emission packets for r600/eg
Dave Airlie [Mon, 6 Jun 2011 10:03:13 +0000 (20:03 +1000)]
r600g: optimise the draw emission packets for r600/eg

This just reduces code size a bit for this chunk.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: use an enabled list to track enabled blocks.
Dave Airlie [Thu, 2 Jun 2011 23:59:12 +0000 (09:59 +1000)]
r600g: use an enabled list to track enabled blocks.

At the end of flushing we were scanning over 450 blocks
with generally about 50 enabled. This reduces the scanning
to just the list of enabled blocks.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g/winsys: overhaul resource range/blocks.
Dave Airlie [Mon, 6 Jun 2011 08:00:36 +0000 (18:00 +1000)]
r600g/winsys: overhaul resource range/blocks.

There isn't much point taking the overhead of range/block lookups on resources
we aren't going to be getting resource registers at wierd offsets.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: split out block init
Dave Airlie [Mon, 6 Jun 2011 04:33:23 +0000 (14:33 +1000)]
r600g: split out block init

This just splits this function up as pre-cursor to reusing
the internals of it.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: move resource setting to its own structures.
Dave Airlie [Fri, 3 Jun 2011 05:34:31 +0000 (15:34 +1000)]
r600g: move resource setting to its own structures.

resource setting could be a fair bit more lightweight,
this patch just separates the resource structs from the standard
reg tracking structs in the driver, later patches will improve
the winsys.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: only call bo loop if nbos is positive.
Dave Airlie [Mon, 6 Jun 2011 01:15:10 +0000 (11:15 +1000)]
r600g: only call bo loop if nbos is positive.

we don't need to loop over all the registers unless we have
some bos in the block, also avoid setting the ctx flags,
and move the optional stuff down below this chunk.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor600g: don't need to call the packet dirty function if not dirty.
Dave Airlie [Fri, 3 Jun 2011 05:24:55 +0000 (15:24 +1000)]
r600g: don't need to call the packet dirty function if not dirty.

also fix a unneeded dirty check and add a dirty check speedup.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agoi915g: implement more opcodes.
Stéphane Marchesin [Mon, 6 Jun 2011 19:32:17 +0000 (12:32 -0700)]
i915g: implement more opcodes.

13 years agoi915g: implement TGSI_OPCODE_SEQ.
Stéphane Marchesin [Sat, 4 Jun 2011 01:57:16 +0000 (18:57 -0700)]
i915g: implement TGSI_OPCODE_SEQ.

13 years agoi915g: handle varyings properly.
Stéphane Marchesin [Sat, 4 Jun 2011 00:06:59 +0000 (17:06 -0700)]
i915g: handle varyings properly.

13 years agoi915g: add missing and unsupported PIPE_CAPs to avoid debug messages.
Stéphane Marchesin [Sat, 4 Jun 2011 00:03:37 +0000 (17:03 -0700)]
i915g: add missing and unsupported PIPE_CAPs to avoid debug messages.

13 years agodri2: protect dri2FlushFrontBuffer against NULL buffers.
Stéphane Marchesin [Sat, 4 Jun 2011 00:03:09 +0000 (17:03 -0700)]
dri2: protect dri2FlushFrontBuffer against NULL buffers.

13 years agoGallium: fix indentation in u_blitter.c
Stéphane Marchesin [Thu, 2 Jun 2011 03:51:59 +0000 (20:51 -0700)]
Gallium: fix indentation in u_blitter.c

13 years agoi915g: don't destroy a texture buffer if it's NULL.
Stéphane Marchesin [Wed, 1 Jun 2011 22:32:39 +0000 (15:32 -0700)]
i915g: don't destroy a texture buffer if it's NULL.

13 years agollvmpipe: use $(CXX) instead of g++ for linking.
Stéphane Marchesin [Wed, 1 Jun 2011 17:37:13 +0000 (10:37 -0700)]
llvmpipe: use $(CXX) instead of g++ for linking.

This allows setting the path to the C++ compiler.

13 years agoi965: Update SURFACE_STATE dumping for Ivybridge.
Kenneth Graunke [Tue, 17 May 2011 21:37:18 +0000 (14:37 -0700)]
i965: Update SURFACE_STATE dumping for Ivybridge.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Update SAMPLER_STATE dumping for Ivybridge.
Kenneth Graunke [Tue, 17 May 2011 21:22:16 +0000 (14:22 -0700)]
i965: Update SAMPLER_STATE dumping for Ivybridge.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Update SF_CLIP_VIEWPORT state dumping for Ivybridge.
Kenneth Graunke [Tue, 17 May 2011 21:28:20 +0000 (14:28 -0700)]
i965: Update SF_CLIP_VIEWPORT state dumping for Ivybridge.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoapple: Package applegl source into MesaLib tarball
Jeremy Huddleston [Mon, 6 Jun 2011 16:48:08 +0000 (12:48 -0400)]
apple: Package applegl source into MesaLib tarball

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agodarwin: Define GALLIUM_DRIVERS_DIRS in darwin config
Jeremy Huddleston [Mon, 6 Jun 2011 15:38:05 +0000 (11:38 -0400)]
darwin: Define GALLIUM_DRIVERS_DIRS in darwin config

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Finish build fixes for applegl_glx.c
Jeremy Huddleston [Mon, 6 Jun 2011 15:27:19 +0000 (11:27 -0400)]
apple: Finish build fixes for applegl_glx.c

libGL.dylib now *builds* on darwin.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: More fixes for compilation failures
Jeremy Huddleston [Mon, 6 Jun 2011 15:15:32 +0000 (11:15 -0400)]
apple: More fixes for compilation failures

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agosoftpipe: Anisotropic filtering extension.
Andreas Faenger [Mon, 6 Jun 2011 07:13:16 +0000 (07:13 +0000)]
softpipe: Anisotropic filtering extension.

Reference implementation which produces high quality renderings.
Based on Higher Quality Elliptical Weighted Avarage Filter (EWA).

Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agost/mesa: fix renderbuffer internal format for accum buffer
Brian Paul [Mon, 6 Jun 2011 14:06:34 +0000 (08:06 -0600)]
st/mesa: fix renderbuffer internal format for accum buffer

Fixes an accum buffer regression since switching to the table-based
format selection code.

13 years agoutil: add \n to debug_checkpoint_full
Marcin Slusarz [Mon, 16 May 2011 19:53:06 +0000 (21:53 +0200)]
util: add \n to debug_checkpoint_full

Signed-off-by: José Fonseca <jfonseca@vmware.com>
13 years agonv50: fix nv50_sampler_state_delete array overflow
Marcin Slusarz [Sun, 5 Jun 2011 19:00:28 +0000 (21:00 +0200)]
nv50: fix nv50_sampler_state_delete array overflow

num_samplers is array of 3 elements, not 5

13 years agoapple: Fix multiple build failures in applegl_glx.c
Jeremy Huddleston [Mon, 6 Jun 2011 01:19:40 +0000 (21:19 -0400)]
apple: Fix multiple build failures in applegl_glx.c

It is still not building, but this gets us many steps closer

See https://bugs.freedesktop.org/show_bug.cgi?id=29162

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Build darwin using applegl rather than indirect
Jeremy Huddleston [Sun, 5 Jun 2011 22:50:55 +0000 (18:50 -0400)]
apple: Build darwin using applegl rather than indirect

This reverts portions of 6849916170c0275c13510251a7b217c20f2b993e that caused
the darwin config to fail to build due to missing implementations in that
commit.

See https://bugs.freedesktop.org/show_bug.cgi?id=29162

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoglx: Dead code removal
Jeremy Huddleston [Sun, 5 Jun 2011 23:55:51 +0000 (19:55 -0400)]
glx: Dead code removal

Remove a redundant ifndef GLX_USE_APPLEGL

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: ifdef out come glapi-foo on darwin
Jeremy Huddleston [Sun, 5 Jun 2011 23:57:52 +0000 (19:57 -0400)]
apple: ifdef out come glapi-foo on darwin

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Change from XExtDisplayInfo to struct glx_display
Jeremy Huddleston [Sun, 5 Jun 2011 23:26:19 +0000 (19:26 -0400)]
apple: Change from XExtDisplayInfo to struct glx_display

Fixes regression introduced by: ab434f6b7641a64d30725a9ac24929240362d466 and
                                c356f5867f2c1fad7155df538b9affa8dbdcf869

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agodri/nouveau: fix gnome-shell segfault
Ben Skeggs [Mon, 6 Jun 2011 00:17:59 +0000 (10:17 +1000)]
dri/nouveau: fix gnome-shell segfault

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
13 years agoapple: Rename GLXcontext
Jeremy Huddleston [Sun, 5 Jun 2011 22:22:47 +0000 (18:22 -0400)]
apple: Rename GLXcontext

Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Rename _gl_context_modes_find_visual to glx_config_find_visual
Jeremy Huddleston [Sun, 5 Jun 2011 22:19:59 +0000 (18:19 -0400)]
apple: Rename _gl_context_modes_find_visual to glx_config_find_visual

Fixes regression introduced by: 6ddf66e9230ee862ac341c4767cf6b3b2dd2552b

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Re-add driContext and do_destroy
Jeremy Huddleston [Sun, 5 Jun 2011 22:02:44 +0000 (18:02 -0400)]
apple: Re-add driContext and do_destroy

Fixes regression introduced by: c491e585e43d48a2aeec96ccc4008da6c443fb42

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Rename GLXcontext
Jeremy Huddleston [Sun, 5 Jun 2011 21:22:56 +0000 (17:22 -0400)]
apple: Rename GLXcontext

Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Rename __GLcontextModes to struct glx_config
Jeremy Huddleston [Sun, 5 Jun 2011 21:02:33 +0000 (17:02 -0400)]
apple: Rename __GLcontextModes to struct glx_config

Fixes regression introduced by: 6ddf66e9230ee862ac341c4767cf6b3b2dd2552b

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Rename glcontextmodes.[ch] to glxconfig.[ch]
Jeremy Huddleston [Sun, 5 Jun 2011 20:56:01 +0000 (16:56 -0400)]
apple: Rename glcontextmodes.[ch] to glxconfig.[ch]

Fixes regression introduced by: 65d98e25770487456eb3d7eb8ec3ec8272f170b1

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agoapple: Update GL specs
Jeremy Huddleston [Sun, 5 Jun 2011 21:14:04 +0000 (17:14 -0400)]
apple: Update GL specs

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
13 years agometa: Don't do sRGB encode for framebuffer blits on sRGB-enabled framebuffers.
Eric Anholt [Wed, 1 Jun 2011 20:15:28 +0000 (13:15 -0700)]
meta: Don't do sRGB encode for framebuffer blits on sRGB-enabled framebuffers.

Fixes fbo-srgb-blit.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35373
Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agometa: Don't do srgb to linear decode when blitting srgb textures.
Eric Anholt [Wed, 1 Jun 2011 20:00:14 +0000 (13:00 -0700)]
meta: Don't do srgb to linear decode when blitting srgb textures.

Fixes the GL_SRGB8_ALPHA8 -> GL_RGBA8 blits in fbo-srgb-blit.c

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoglx: Fix use-before-null-check in dri2InvalidateBuffers().
Eric Anholt [Wed, 1 Jun 2011 20:39:39 +0000 (13:39 -0700)]
glx: Fix use-before-null-check in dri2InvalidateBuffers().

The compiler used our dereference here to skip the NULL check below.
Fixes window resize in "jconsole -J-Dsun.java2d.opengl=True" under
OpenJDK 6.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37766
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agoi965: Drop remaining strict conformance fallback for GL_POINT_SMOOTH.
Eric Anholt [Wed, 25 May 2011 19:59:25 +0000 (12:59 -0700)]
i965: Drop remaining strict conformance fallback for GL_POINT_SMOOTH.

We actually could do this in hardware in the fragment shader using
gl_PointCoord and the point's size.

13 years agoi965: Drop strict conformance fallback for GL_LINE_STIPPLE.
Eric Anholt [Wed, 25 May 2011 19:58:21 +0000 (12:58 -0700)]
i965: Drop strict conformance fallback for GL_LINE_STIPPLE.

We implement line stipples, just not *quite* correctly.  We have a
piglit testcase to use when we want to fix it, if we do.  Until then,
don't lie to our test suites.

13 years agoi965: Drop strict conformance fallback for GL_LINE_SMOOTH.
Eric Anholt [Wed, 25 May 2011 19:54:49 +0000 (12:54 -0700)]
i965: Drop strict conformance fallback for GL_LINE_SMOOTH.

We do have hardware antialised lines.  If we care, we should actually
fix them to be conformant (or as close as possible) instead of using
this knob to fool testcases using swrast.

For some interesting reading on the state of GL_*_SMOOTH across
several drivers, see:
http://homepage.mac.com/arekkusu/bugs/invariance/HWAA.html

13 years agoi965: Drop strict conformance fallback for GL_POLYGON_SMOOTH.
Eric Anholt [Wed, 25 May 2011 19:51:47 +0000 (12:51 -0700)]
i965: Drop strict conformance fallback for GL_POLYGON_SMOOTH.

From my reading of the GL 2.1 spec, no antialiasing is strictly
conformant for polygon smoothing.  Yes, it's absurd, but then,
hardware doesn't support this so maybe it's not so absurd.

13 years agoi965: Drop INTEL_CONFORMANCE=2 fallback code.
Eric Anholt [Wed, 25 May 2011 19:51:05 +0000 (12:51 -0700)]
i965: Drop INTEL_CONFORMANCE=2 fallback code.

This was just a duplicate of no_rast=true driconf option, which is
relatively standard across drivers.