Commit graph

29849 commits

Author SHA1 Message Date
Corbin Simpson
467cccf0a7 docs: Don't check in generated docs.
Per ML discussion.
2010-01-05 08:22:52 -08:00
Corbin Simpson
acb8073d07 docs: Stub out list of modules in core distribution of G3D. 2010-01-05 08:22:18 -08:00
Brian Paul
ef1b942691 st/mesa: added PROGRAM_LOCAL_PARAM case in src_register()
Fixes piglit vpfp-generic arl.vpfp failure when using gallium.
2010-01-05 09:14:50 -07:00
Kristian Høgsberg
ae44b92f61 Merge branch 'remove-intel-dri1'
* remove-intel-dri1:
  intel: intelScreenContext() is no longer used
  intel: Remove remaining dri2.enabled tests
  intel: Drop more cliprect bookkeeping
  intel: Remove struct intel_framebuffer
  intel: Remove client-side vblank code
  intel: Drop intelWindowMoved()
  intel: Drop batchbuffer cliprect_mode tracking
  intel: Drop DRI1 static regions
  intel: Use depth buffer from ctx.DrawBuffer in copypix_src_region()
  intel: Drop LOCK/UNLOCK_HARDWARE()
  intel: Drop DRI1 SwapBuffer implementation
  intel: Drop DRI1 CopySubBuffer implementation
  intel: Drop DRI1 support
  Push __driDriverExtensions out of dri_util.c and into the drivers
  Remove leftover __DRI{screen,drawable,context}Private references
  Check for libdrm_$chipset.pc when needed
2010-01-05 10:31:11 -05:00
Chia-I Wu
e5d351dcfd Add es state tracker to autoconf.
mesa/es is needed in SRC_DIRS to build es state tracker.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-05 08:08:34 -07:00
Chia-I Wu
976c858acc Clean up ES_FILES.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-05 08:08:30 -07:00
Brian Paul
bd96b51303 mesa: bump version to 7.7.1-DEVEL 2010-01-05 07:59:29 -07:00
Keith Whitwell
c727fa6dbf Merge commit 'origin/gallium-draw-retval'
Conflicts:
	src/gallium/drivers/identity/id_context.c
2010-01-05 14:13:40 +00:00
Andre Maasikas
c91ceeec32 r600: adjust after radeon mipmap changes in 7118db8700
R600_OUT_BATCH_RELOC doesn't really use offset so set it
in TEX_RESOURCE2
+ typo fix
2010-01-05 15:36:32 +02:00
Andre Maasikas
750c1e7bb4 r600: support depth compare functions & shadow_ambient 2010-01-05 13:48:04 +02:00
Michal Krol
76ff89d2de gallium: Handle InstanceID as a true 32-bit uint. 2010-01-05 11:48:32 +01:00
Michal Krol
9b21b3c52a Merge branch 'master' into instanced-arrays
Conflicts:
	src/gallium/auxiliary/tgsi/tgsi_dump.c
	src/gallium/include/pipe/p_shader_tokens.h
2010-01-05 11:04:50 +01:00
Michal Krol
1f9aa38f4e tgsi: Simplify implementation of few interpreter's instructions. 2010-01-05 11:00:07 +01:00
Michal Krol
55b5c8816e tgsi: Use FREE() to release MALLOC-ed() memories in sanity. 2010-01-05 09:28:41 +01:00
Michal Krol
767d1472df tgsi: Fix bogus loop condition in sanity. 2010-01-05 09:28:39 +01:00
Michal Krol
c301fa6fc8 tgsi: Treat MOV source operand as FLOAT so modifiers works as expected. 2010-01-05 09:28:36 +01:00
Michal Krol
7218322703 tgsi: Store ADDR file in interpreter as an int. 2010-01-05 09:28:34 +01:00
Michal Krol
7c8e67e4aa tgsi: Remove dead micro_umod(). 2010-01-05 09:28:32 +01:00
Michal Krol
97f9a147db tgsi: Make interpreter aware of float and integer data types.
Debug check for inf and nan only on float channels.

Apply absolute and negate source operand modifiers based on
opcode type.
2010-01-05 09:28:29 +01:00
Michal Krol
c34f6faf35 gallium: Add UMOD TGSI opcode.
Either that or have UDIV have two destination operands.
2010-01-05 09:28:27 +01:00
Michal Krol
062aab96e0 gallium: Add SWITCH, CASE, DEFAULT and ENDSWITCH opcodes to TGSI.
Provide reference implementation of them in tgsi_exec.

Note that BREAK opcode is overloaded and can be used to break out
of either a loop or a switch-case statement.
2010-01-05 09:28:25 +01:00
Michal Krol
08a3efee10 tgsi/ureg: Improve immediate match & expand logic.
Do not pollute immediates with unsuccessfull attempts to expand them.
2010-01-05 09:27:13 +01:00
Michal Krol
ff56a12051 tgsi: Support signed/unsigned integer immediate types. 2010-01-05 09:27:10 +01:00
Michal Krol
b1c55e80aa gallium: Add signed/unsigned int immediate data types. 2010-01-05 09:27:08 +01:00
Michal Krol
bf4b4c1b6f tgsi: Cleanup interpreter code for other existing integer opcodes. 2010-01-05 09:27:06 +01:00
Michal Krol
2c046034dc Remove TGSI_OPCODE_SHR, map existing usage to TGSI_OPCODE_ISHR.
This is to differentiate it from its unsigned version, TGSI_OPCODE_USHR.
2010-01-05 09:26:48 +01:00
Michal Krol
df0826fba3 tgsi: Implement new integer opcodes.
Update interpreter and ureg.
Also, get rid of SHR -- it's actually an alias for ISHR.
2010-01-05 09:26:46 +01:00
Michal Krol
c59eda0993 gallium: Add more integer TGSI opcodes. 2010-01-05 09:26:43 +01:00
Brian Paul
7836a96657 mesa: added _mesa_[Get]TexParameterI[u]iv() functions
New in GL 3.0.  Primarily meant for setting int/uint-valued texture
border color.  Not plugged into dispatch table yet.
2010-01-04 20:00:09 -07:00
Brian Paul
f6c2d1f94f mesa: make texture BorderColor a union of float/int/uint
When we have integer-valued texture formats, the texture border color
must also store integer and uint values.

With GL 3.0, the new glTexParameterIiv() and glTexParameterIuiv() functions
can set the border color to int or uint values.
2010-01-04 19:53:30 -07:00
Brian Paul
32b9983c0a mesa: use get_texobj() in _mesa_GetTexParameter() funcs 2010-01-04 19:20:33 -07:00
Brian Paul
5ac16495a2 Merge branch 'mesa_7_7_branch'
Conflicts:
	docs/relnotes.html
	src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
	src/gallium/drivers/r300/r300_cs.h
	src/mesa/drivers/dri/i965/brw_wm_surface_state.c
	src/mesa/main/enums.c
2010-01-04 19:16:24 -07:00
Brian Paul
6d84580858 mesa: add missing _mesa_lock_texture() call 2010-01-04 19:05:31 -07:00
Eric Anholt
b434a816d7 i915: Use _MaxLevel on principle in texture setup.
It was OK before because we proceed to clamp the value to hardware
limits, but given that other use of MaxLevel has been a trap, let's
avoid it.
2010-01-04 14:15:12 -08:00
Eric Anholt
19a26dfc47 intel: Fix CopyTexImage from tiled mipmap levels > 0.
Fixes piglit fbo-copyteximage.
2010-01-04 14:15:12 -08:00
Eric Anholt
63610fae4f i965: Fix the surface offset calculation for tiled buffers.
If we ever had a non-tile-aligned tiled renderbuffer, the math was all
off.  Use the existing x,y coordinates instead of trying to
reconstruct them from an incorrectly-calculated offset value.
2010-01-04 14:15:12 -08:00
Andre Maasikas
a160d1c27d r600: support vertex_array_bgra
Use vertex program key mechanism and swizzle during vertex fetch - is there
a better way?
2010-01-04 16:16:43 -05:00
Chia-I Wu
8e6774937f progs/es1: Add compressed paletted texture tests to torus.
The tests can be toggled by `t'.  It will print current texture format
and the size of the image.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:16 -07:00
Chia-I Wu
a316b700ef mesa/es: Improve support for GL_OES_compressed_paletted_texture.
Add error checking and fix handling of level (it should be negative).
Besides, always use the palette entry format/type when calling
_mesa_TexImage2D.  It respects the base internal formats of the cpal
formats, and is simpler and faster, except for cases where the unpack
alignment needs to be changed.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:16 -07:00
Chia-I Wu
c4b9e1aa1a mesa/es: Fix GL_RGB565 support in FBO.
In GL_OES_framebuffer_object and OpenGL ES 2.0, GL_RGB565 is a valid
internal format.  Since it is not supported by the core, map it to
GL_RGB5 as a workaround.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:16 -07:00
Chia-I Wu
b80ec33f35 mesa/es: Fix GL_OES_texture_cube_map support.
Unlike in OpenGL, GL_OES_texture_cube_map says that all coordinates are
changed the same time by the token GL_TEXTURE_GEN_STR_OES, and the
initial mode is GL_REFLECTION_MAP_OES.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
3a4d0811b4 mesa/es: Clean up extension string.
Add some new extensions and remove those that do not belong to
OpenGL ES 2.0.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
f88297b369 mesa/es: Add more exnteions to APIspec.
This commit adds definitions of

  GL_EXT_texture_compression_dxt1
  GL_EXT_texture_lod_bias
  GL_EXT_blend_minmax
  GL_EXT_multi_draw_arrays

to APIspec.xml and get_gen.py.  Some of the enums are not avaiable in
the header files and the defining extensions are disabled.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
29bd20ad14 mesa/es: Add more extensions to glapi.
This commit adds definitions of

  GL_OES_texture_half_float_linear, GL_OES_texture_float_linear
  GL_OES_texture_half_float, GL_OES_texture_float
  GL_OES_vertex_half_float
  GL_OES_vertex_type_10_10_10_2
  GL_OES_get_program_binary
  GL_EXT_texture_compression_dxt1
  GL_EXT_texture_format_BGRA8888
  GL_EXT_texture_lod_bias
  GL_EXT_blend_minmax
  GL_EXT_read_format_bgra
  GL_EXT_multi_draw_arrays

to glapi.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
a2d21f67f9 mesa/es: Generate code for special functions.
es_generator.py did not generate code for special functions.  They were
supposed to be defined elsewhere.  But as a result, parameter checking
was also skipped.  This commit changes the way special functions are
called so that parameter checking is always performed.

When there is nothing to check, the check functions becomes macros
expanding to the real functions, as an optimization.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
f7d23dfef5 mesa/es: Remove unused code in es_generator.py.
Remove unused GetLoopSizeExpression.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
e0ab739c06 mesa/es: Generate _mesa_GetFixedv.
Have get_gen.py generate _mesa_GetFixedv.  The generated function does
all the checkings and thus simplifies APIspec.xml a bit.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
c3bd857917 mesa/es: Add a sanity check to APIspec.py.
Some attributes are constant in a switch.  Raise an exception if they
are not.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
8264a6a8a6 mesa/es: Switch to APIspec.xml.
Update Makefile and ES generator to use APIspec.xml.  Remove APIspec.txt
and related files.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00
Chia-I Wu
0c1a7bbe0d mesa/es: Add APIspec.xml and its parser.
APIspec.xml is based on APIspec.txt.  The new format has less code
duplications and should be easier to read.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:15 -07:00