| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Directly include mtypes.h if a file uses a gl_context struct. This
allows future removal of headers that are not strictly necessary but
indirectly include mtypes.h for a file.
|
| |
|
| |
|
| |
|
|
|
|
| |
As per discussions at XDS.
|
| |
|
|
|
|
|
|
|
| |
Add features tested in the code but missing from mfeatures.h.
This also fixes some tests of features. They should be tested with
"#if", not "#ifdef".
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We were misinterpretting GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS previously.
It's the number of texture units for which we need to keep state; not
just the total number of texture units addressable by the vertex shader
plus fragment shader.
Since sw Mesa independently supports 16 texture units in vertex shaders
and 16 texture units in fragment shaders, the max combined units is 32.
Note that the docs for glActiveTexture() indicate the max legal unit is
MAX(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, MAX_TEXTURE_COORDS) - 1.
A new piglit test (texunits.c) tests the various texture unit limits.
I'm pretty sure I've got this all right now, but additional reviews
are welcome...
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
src/gallium/auxiliary/pipebuffer/Makefile
src/gallium/auxiliary/pipebuffer/SConscript
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/tgsi/tgsi_scan.c
src/gallium/drivers/i915/i915_surface.c
src/gallium/drivers/i915/i915_texture.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/gallium/state_trackers/xorg/xorg_dri2.c
src/gallium/winsys/drm/intel/gem/intel_drm_api.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
src/mesa/state_tracker/st_cb_clear.c
|
| | |
|
| |
| |
| |
| |
| | |
New in GL 3.0. Primarily meant for setting int/uint-valued texture
border color. Not plugged into dispatch table yet.
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|/ |
|
| |
|
|\ |
|
| | |
|
| |
| |
| |
| |
| | |
_mesa_TexParameteri calls set_tex_parameteri, which uses the
params argument as an array.
|
| |
| |
| |
| |
| | |
_mesa_TexParameteri calls set_tex_parameterf, which uses the
params argument as an array.
|
| |
| |
| |
| |
| | |
_mesa_TexParameterfv calls set_tex_parameteri, which uses the
params argument as an array.
|
| |
| |
| |
| |
| |
| | |
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
(cherry picked from commit 270d36da146b899d39e08f830fe34b63833a3731)
|
| |
| |
| |
| |
| |
| | |
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.
(cherry picked from commit a201dfb6bf28b89d6f511c2ec9ae0d81ef18511d)
|
| |
| |
| |
| |
| | |
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
|
| |
| |
| |
| |
| | |
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.
|
| | |
|
| |
| |
| |
| |
| |
| | |
Some of the fixes are cherry-picked from opengl-es branch.
Signed-off-by: Chia-I Wu <[email protected]>
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/s3v/s3v_tex.c
src/mesa/drivers/dri/s3v/s3v_xmesa.c
src/mesa/drivers/dri/trident/trident_context.c
src/mesa/main/debug.c
src/mesa/main/mipmap.c
src/mesa/main/texformat.c
src/mesa/main/texgetimage.c
|
| |
| |
| |
| | |
Use _mesa_format_image_size() instead.
|
| |
| |
| |
| | |
Use _mesa_is_format_compressed() instead.
|
| |
| |
| |
| |
| |
| | |
Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum.
ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x.
gl_texture_format will go away next.
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
| |
Need to return the actual compressed format when the user originally
requested a generic compressed format.
|
|\ |
|
| |
| |
| |
| | |
Signed-off-by: Brian Paul <[email protected]>
|
| |
| |
| |
| | |
tex_image_dimensions()
|
| | |
|
| | |
|
|/ |
|
| |
|
|
|
|
|
|
|
|
|
| |
premature return in TexParameterf caused mesa to never call Driver.TexParameter
breaking drivers relying on this (fix bug #20966).
While here, also fix using ctx->ErrorValue when deciding to call
Driver.TexParameter. Errors are sticky and uncleared errors thus would cause
this to no longer get called. Since we thus need return value of
set_tex_parameter[if] can also optimize this to only call when value changed.
|
| |
|
|
|
|
| |
Use loops to consolidate lots of texture object code.
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
Signed-off-by: Ian Romanick <[email protected]>
|
|
|
|
| |
Everyone should be using the newer/better ARB versions of these extensions.
|
| |
|
| |
|