Mesa (master): 22 new commits
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=96b45e67d506a02dd082fe2abf5d016e1fdeb4da Author: Emil Velikov Date: Mon Aug 18 23:41:45 2014 +0100 st/egl: ship all the files in the tarball Namely we were missing the headers and the Android/SCons buildscripts. Signed-off-by: Emil Velikov URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=da1d32490998606a32fa256b40527afe37c8f66f Author: Emil Velikov Date: Mon Aug 18 23:16:24 2014 +0100 st/clover: sort the sources list Signed-off-by: Emil Velikov URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=010fa9074e06bddfd2c0c61ec6a408565ee78a1b Author: Emil Velikov Date: Mon Aug 18 01:17:30 2014 +0100 st/gbm: include the header in the sources list Signed-off-by: Emil Velikov URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=27be19aa458e0225cd8c96586c478f1dfc409949 Author: Emil Velikov Date: Mon Aug 18 00:54:38 2014 +0100 st/xlib: Include the headers in the sources list. Yet another step towards a working 'make dist'. Cc: José Fonseca Signed-off-by: Emil Velikov Acked-by: José Fonseca URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=526a9d9c5ea26b08472ff572675c01338b430595 Author: Emil Velikov Date: Mon Aug 18 00:51:07 2014 +0100 st/omx: use makefile.sources to handle sources lists ... and add the headers so that 'make check' is happy. Cc: Christian König Signed-off-by: Emil Velikov Reviewed-by: Christian König URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6507d2357e23b95722b5b7f61ead81c37e6e914 Author: Emil Velikov Date: Mon Aug 18 00:47:38 2014 +0100 st/vdpau: pickup/ship the private header Signed-off-by: Emil Velikov Reviewed-by: Christian König URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3fd703e85c07225d3173f104f5384e0f07233c6 Author: Emil Velikov Date: Mon Aug 18 16:56:48 2014 +0100 st/vdpau: remove obsolete define VL_HANDLES This define is always set and it had no real purpose according to git log. Seems like it is a leftover from the vl/vdpau prototype stage. Cc: Christian König Signed-off-by: Emil Velikov Reviewed-by: Christian König URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=60d772cd9d100a0573371af8461b55804b0f903a Author: Emil Velikov Date: Mon Aug 18 00:43:16 2014 +0100 st/vega: add headers and SConscript in the tarball Signed-off-by: Emil Velikov URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bcdb47d838b8b5fb2f0e6a7a371b99e59955488b Author: Emil Velikov Date: Mon Aug 18 00:08:26 2014 +0100 st/xa: add remaining files in the tarball Namely - the private header (xa_priv.h) - README and - xa-indent Sort the sources list while we're here. Signed-off-by: Emil Velikov URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=398f6eef490e40c6aff9fb9899248d1f2e79 Author: Emil Velikov Date: Mon Aug 18 00:02:07 2014 +0100 st/xvmc: pick up the headers for distribution - autotools/make will pick them up in the tarball. - Sort the list alphabetically. Signed-off-by: Emil Velikov URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6e5801b40191998dfc9438cc40144ca5996a24f Author: Emil Velikov Date: Sun Aug 17 23:56:19 2014 +0100 Revert "configure: Disable xvmc by default" This reverts commit 6a19bb56e09e841553ad1295f74fa21bfbbe752a. The above commit disabled the default build of xvmc as the xvmc tests were failing. As pointed out by Ilia, the tests are "broken by design" as they do not test the object that is build but the one that is installed and setup on the workstation. With previous commit we moved the programs from the 'make check' to noinst automake target. This way they won't be run but will be around for people to use them. Cc: Tom Stellard URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=91f49befd0ab8b8c2242e94dcd7c0682adff57ff Author: Emil Velikov Date: Sun Aug 17 23:55:48 2014 +0100 st/xvmc: automake: move tests to noinst All the tests require an installed and setup XvMC, thus they are not good candidates for 'make check'. Keep them around as the user might want to actually test the implementation post installation/setup. Cc: Ilia Mirkin Cc: Tom Stellard Cc: Christian König Signed-off-by: Emil Velikov URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=015792fb028de32293d3165e5f61b4569858d8eb Author: Emil Velikov Date: Sun Aug 17 23:29:56 2014 +0100 winsys/sw: add the final files to the tarball Add the final remaining files into the tarball (make dist), namely: - SConscripts - Non-autotooled winsys' - android, gdi and hgl. Signed-off-by: Emil Velikov URL: http://cgit.free
Mesa (10.3): radeon/uvd: fix field handling on R6XX style UVD
Module: Mesa Branch: 10.3 Commit: 0c67167370bfbfee7d456812c13a87b239530dc9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c67167370bfbfee7d456812c13a87b239530dc9 Author: Christian König Date: Sun Aug 24 12:22:08 2014 +0200 radeon/uvd: fix field handling on R6XX style UVD The first UVD generation can only do frame based output. Signed-off-by: Christian König (cherry picked from commit 80771e47b6c1e47ab55f17311e1d4e227a9eb3d8) Nominated-by: Alex Deucher --- src/gallium/drivers/radeon/radeon_video.c |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeon/radeon_video.c index 17e9a59..6dcee45 100644 --- a/src/gallium/drivers/radeon/radeon_video.c +++ b/src/gallium/drivers/radeon/radeon_video.c @@ -251,8 +251,11 @@ int rvid_get_video_param(struct pipe_screen *screen, profile != PIPE_VIDEO_PROFILE_VC1_MAIN; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: - /* and MPEG2 only with shaders */ - return codec != PIPE_VIDEO_FORMAT_MPEG12; + /* MPEG2 only with shaders and no support for + interlacing on R6xx style UVD */ + return codec != PIPE_VIDEO_FORMAT_MPEG12 && + /* TODO: RV770 might actually work */ + rscreen->family > CHIP_RV770; default: break; } ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallium/targets: Haiku softpipe, perform better framebuffer validation
Module: Mesa
Branch: master
Commit: 86d1aa8531fabb41c32c128305af625458c0fa7f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=86d1aa8531fabb41c32c128305af625458c0fa7f
Author: Alexander von Gluck IV
Date: Mon Aug 25 14:32:42 2014 +
gallium/targets: Haiku softpipe, perform better framebuffer validation
* Check for back left attachment as well
* Set and act on pipe format none
Ack'ed by Emil Velikov
---
.../targets/haiku-softpipe/GalliumFramebuffer.cpp | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
b/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
index 84c8bd2..d6bfdb4 100644
--- a/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
@@ -100,8 +100,10 @@ hgl_framebuffer_validate(struct st_context_iface* stctx,
switch(statts[i]) {
case ST_ATTACHMENT_FRONT_LEFT:
+ case ST_ATTACHMENT_BACK_LEFT:
format =
context->stVisual->color_format;
- bind = PIPE_BIND_RENDER_TARGET;
+ bind = PIPE_BIND_DISPLAY_TARGET
+ | PIPE_BIND_RENDER_TARGET;
break;
case ST_ATTACHMENT_DEPTH_STENCIL:
format =
context->stVisual->depth_stencil_format;
@@ -112,14 +114,18 @@ hgl_framebuffer_validate(struct st_context_iface* stctx,
bind = PIPE_BIND_RENDER_TARGET;
break;
default:
- ERROR("%s: Unexpected attachment
type!\n", __func__);
+ format = PIPE_FORMAT_NONE;
+ break;
}
- templat.format = format;
- templat.bind = bind;
- struct pipe_screen* screen = context->manager->screen;
- context->textures[i] = screen->resource_create(screen,
&templat);
- out[i] = context->textures[i];
+ if (format != PIPE_FORMAT_NONE) {
+ templat.format = format;
+ templat.bind = bind;
+
+ struct pipe_screen* screen =
context->manager->screen;
+ context->textures[i] =
screen->resource_create(screen, &templat);
+ out[i] = context->textures[i];
+ }
}
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallium/targets: Break haiku state_tracker out to own directory
Module: Mesa
Branch: master
Commit: 311b59495c81f26ee3bee4d8c9e36c0ce15be155
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=311b59495c81f26ee3bee4d8c9e36c0ce15be155
Author: Alexander von Gluck IV
Date: Mon Aug 25 21:26:15 2014 +
gallium/targets: Break haiku state_tracker out to own directory
Ack'ed by Emil Velikov
---
src/gallium/SConscript |1 +
src/gallium/state_trackers/hgl/SConscript | 23 +
.../sw => state_trackers}/hgl/bitmap_wrapper.cpp |0
.../sw => state_trackers}/hgl/bitmap_wrapper.h |0
.../hgl/hgl.c} | 103
src/gallium/state_trackers/hgl/hgl_context.h | 79 +++
.../targets/haiku-softpipe/GalliumContext.cpp | 14 +--
.../targets/haiku-softpipe/GalliumContext.h| 34 +--
.../targets/haiku-softpipe/GalliumFramebuffer.h| 34 ---
src/gallium/targets/haiku-softpipe/SConscript |3 +-
src/gallium/winsys/sw/hgl/SConscript |2 +-
src/hgl/GLRendererRoster.cpp |2 +-
12 files changed, 157 insertions(+), 138 deletions(-)
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 98d017e..977e3fb 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -85,6 +85,7 @@ if not env['embedded']:
if env['platform'] == 'haiku':
SConscript([
+'state_trackers/hgl/SConscript',
'targets/haiku-softpipe/SConscript',
])
diff --git a/src/gallium/state_trackers/hgl/SConscript
b/src/gallium/state_trackers/hgl/SConscript
new file mode 100644
index 000..05b8214
--- /dev/null
+++ b/src/gallium/state_trackers/hgl/SConscript
@@ -0,0 +1,23 @@
+###
+# SConscript for Haiku state_tracker
+
+Import('*')
+
+env = env.Clone()
+
+env.Append(CPPPATH = [
+'#/src',
+'#/src/mapi',
+'#/src/mesa',
+])
+
+sources = [
+'hgl.c',
+ 'bitmap_wrapper.cpp',
+]
+
+st_haiku = env.ConvenienceLibrary(
+target = 'st_haiku',
+source = sources
+)
+Export('st_haiku')
diff --git a/src/gallium/winsys/sw/hgl/bitmap_wrapper.cpp
b/src/gallium/state_trackers/hgl/bitmap_wrapper.cpp
similarity index 100%
rename from src/gallium/winsys/sw/hgl/bitmap_wrapper.cpp
rename to src/gallium/state_trackers/hgl/bitmap_wrapper.cpp
diff --git a/src/gallium/winsys/sw/hgl/bitmap_wrapper.h
b/src/gallium/state_trackers/hgl/bitmap_wrapper.h
similarity index 100%
rename from src/gallium/winsys/sw/hgl/bitmap_wrapper.h
rename to src/gallium/state_trackers/hgl/bitmap_wrapper.h
diff --git a/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
b/src/gallium/state_trackers/hgl/hgl.c
similarity index 61%
rename from src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
rename to src/gallium/state_trackers/hgl/hgl.c
index d6bfdb4..1d6fa73 100644
--- a/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
+++ b/src/gallium/state_trackers/hgl/hgl.c
@@ -8,37 +8,33 @@
*/
-#include "GalliumFramebuffer.h"
-
-extern "C" {
#include "main/context.h"
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
#include "pipe/p_format.h"
-#include "state_tracker/st_manager.h"
+#include "util/u_atomic.h"
#include "util/u_memory.h"
-}
-#include "GalliumContext.h"
+#include "hgl_context.h"
#ifdef DEBUG
-# define TRACE(x...) printf("GalliumFramebuffer: " x)
+# define TRACE(x...) printf("hgl:state_tracker: " x)
# define CALLED() TRACE("CALLED: %s\n", __PRETTY_FUNCTION__)
#else
# define TRACE(x...)
# define CALLED()
#endif
-#define ERROR(x...) printf("GalliumFramebuffer: " x)
+#define ERROR(x...) printf("hgl:state_tracker: " x)
static boolean
-hgl_framebuffer_flush_front(struct st_context_iface *stctx,
+hgl_st_framebuffer_flush_front(struct st_context_iface *stctx,
struct st_framebuffer_iface* stfb, enum st_attachment_type statt)
{
CALLED();
- hgl_context* context = (hgl_context*)stfb->st_manager_private;
+ struct hgl_context* context = (struct
hgl_context*)stfb->st_manager_private;
if (!context) {
ERROR("%s: Couldn't obtain valid hgl_context!\n", __func__);
@@ -58,20 +54,23 @@ hgl_framebuffer_flush_front(struct st_context_iface *stctx,
}
+/**
+ * Called by the st manager to validate the framebuffer (allocate
+ * its resources).
+ */
static boolean
-hgl_framebuffer_validate(struct st_context_iface* stctx,
- struct st_framebuffer_iface* stfb,
- const enum st_attachment_type* statts, unsigned count,
- struct pipe_resource** out)
+hgl_st_framebuffer_validate(struct st_context_iface *stctx,
+ struct st_framebuffer_iface *stfbi, const enum st_attachment_type
*statts,
+ unsigned count, struct pipe_resource **out)
{
CALLED();
- if (!stfb) {
+ if (!stfbi) {
ERROR("%s: Invalid st framebuffer interface!\n", __func__);
Mesa (master): hgl: trivial bits
Module: Mesa
Branch: master
Commit: 5b8900ded3988084c5bf005c0780efbec912d755
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b8900ded3988084c5bf005c0780efbec912d755
Author: Emil Velikov
Date: Thu Aug 28 21:54:20 2014 +0100
hgl: trivial bits
Signed-off-by: Emil Velikov
---
src/gallium/Makefile.am |8
src/gallium/state_trackers/hgl/SConscript |2 +-
src/gallium/state_trackers/hgl/hgl.c |2 +-
src/gallium/targets/haiku-softpipe/SConscript |2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index caf29ad..e4ef003 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -173,6 +173,14 @@ SUBDIRS += state_trackers/xvmc targets/xvmc
endif
##
+## Don't forget to bundle the remaining (non autotools) state-trackers/targets
+##
+
+EXTRA_DIST += \
+ state_trackers/hgl targets/haiku-softpipe
+
+
+##
## Gallium tests
##
diff --git a/src/gallium/state_trackers/hgl/SConscript
b/src/gallium/state_trackers/hgl/SConscript
index 05b8214..82a0ce0 100644
--- a/src/gallium/state_trackers/hgl/SConscript
+++ b/src/gallium/state_trackers/hgl/SConscript
@@ -13,7 +13,7 @@ env.Append(CPPPATH = [
sources = [
'hgl.c',
- 'bitmap_wrapper.cpp',
+'bitmap_wrapper.cpp',
]
st_haiku = env.ConvenienceLibrary(
diff --git a/src/gallium/state_trackers/hgl/hgl.c
b/src/gallium/state_trackers/hgl/hgl.c
index 1d6fa73..8dcd6e3 100644
--- a/src/gallium/state_trackers/hgl/hgl.c
+++ b/src/gallium/state_trackers/hgl/hgl.c
@@ -95,7 +95,7 @@ hgl_st_framebuffer_validate(struct st_context_iface *stctx,
for (unsigned i = 0; i < count; i++) {
enum pipe_format format = PIPE_FORMAT_NONE;
unsigned bind = 0;
-
+
switch(statts[i]) {
case ST_ATTACHMENT_FRONT_LEFT:
case ST_ATTACHMENT_BACK_LEFT:
diff --git a/src/gallium/targets/haiku-softpipe/SConscript
b/src/gallium/targets/haiku-softpipe/SConscript
index d89a2af..d5fd699 100644
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -2,7 +2,7 @@ Import('*')
env.Prepend(LIBS = [
ws_haiku,
- st_haiku,
+st_haiku,
trace,
rbug,
mesautil,
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): include/haiku: fix comment typo
Module: Mesa Branch: master Commit: 3b36ba4c399d9018409af0674cbd50c371385ce9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b36ba4c399d9018409af0674cbd50c371385ce9 Author: Emil Velikov Date: Thu Aug 28 22:22:19 2014 +0100 include/haiku: fix comment typo Cc: Alexander von Gluck IV Signed-off-by: Emil Velikov --- include/HaikuGL/OpenGLKit.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/HaikuGL/OpenGLKit.h b/include/HaikuGL/OpenGLKit.h index f482871..71d9830 100644 --- a/include/HaikuGL/OpenGLKit.h +++ b/include/HaikuGL/OpenGLKit.h @@ -7,4 +7,4 @@ // Projects needing GL/glu.h and GL/glut.h should now // include these headers independently as glu and glut -// are no longe core parts of mesa +// are no longer core parts of mesa ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): targets/haiku-softpipe: explicitly prefix sw/hgl header
Module: Mesa
Branch: master
Commit: 76e5406e585c0d001fc215cda080d450e93d426f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=76e5406e585c0d001fc215cda080d450e93d426f
Author: Emil Velikov
Date: Thu Aug 28 22:22:21 2014 +0100
targets/haiku-softpipe: explicitly prefix sw/hgl header
Cc: Alexander von Gluck IV
Signed-off-by: Emil Velikov
---
src/gallium/targets/haiku-softpipe/GalliumContext.cpp |2 +-
src/gallium/targets/haiku-softpipe/SConscript |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
index c740458..d7d5d9d 100644
--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
@@ -26,8 +26,8 @@ extern "C" {
#include "state_tracker/st_gl_api.h"
#include "state_tracker/st_manager.h"
#include "state_tracker/sw_winsys.h"
+#include "sw/hgl/hgl_sw_winsys.h"
#include "util/u_memory.h"
-#include "hgl_sw_winsys.h"
#include "target-helpers/inline_sw_helper.h"
#include "target-helpers/inline_debug_helper.h"
diff --git a/src/gallium/targets/haiku-softpipe/SConscript
b/src/gallium/targets/haiku-softpipe/SConscript
index d5fd699..210721c 100644
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -26,7 +26,7 @@ env.Append(CPPPATH = [
'#/src/mesa',
'#/src/mesa/main',
'#/include/HaikuGL',
-'#/src/gallium/winsys/sw/hgl',
+'#/src/gallium/winsys',
'#/src/gallium/state_trackers/hgl',
'/boot/system/develop/headers/private',
])
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): sw/hgl: struct haiku_displaytarget is not public struct
Module: Mesa
Branch: master
Commit: f5fb9c556b8c71b11d6bdd2b18fc39b6fe7d746d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5fb9c556b8c71b11d6bdd2b18fc39b6fe7d746d
Author: Emil Velikov
Date: Thu Aug 28 22:22:20 2014 +0100
sw/hgl: struct haiku_displaytarget is not public struct
It is meant to be private within the actual winsys. Remove it from
the exported header, and fold it into it's only user.
Cc: Alexander von Gluck IV
Signed-off-by: Emil Velikov
---
src/gallium/winsys/sw/hgl/hgl_sw_winsys.c | 19 +++
src/gallium/winsys/sw/hgl/hgl_sw_winsys.h | 25 ++---
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
index 27eca2b..8e8413b 100644
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
@@ -27,15 +27,34 @@
#include "pipe/p_compiler.h"
+#include "pipe/p_defines.h"
#include "pipe/p_format.h"
#include "util/u_inlines.h"
#include "util/u_format.h"
#include "util/u_math.h"
#include "util/u_memory.h"
+#include "state_tracker/st_api.h"
+#include "state_tracker/sw_winsys.h"
+#include "bitmap_wrapper.h"
#include "hgl_sw_winsys.h"
+struct haiku_displaytarget
+{
+ enum pipe_format format;
+ color_space colorSpace;
+
+ unsigned width;
+ unsigned height;
+ unsigned stride;
+
+ unsigned size;
+
+ void* data;
+};
+
+
// Cast
static INLINE struct haiku_displaytarget*
hgl_sw_displaytarget(struct sw_displaytarget* target)
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
index 5a2bef7..bdcddfb 100644
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
@@ -27,30 +27,9 @@
#ifndef _HGL_SOFTWAREWINSYS_H
#define _HGL_SOFTWAREWINSYS_H
+struct sw_winsys;
-#include "pipe/p_defines.h"
-#include "state_tracker/st_api.h"
-#include "state_tracker/sw_winsys.h"
-
-#include "bitmap_wrapper.h"
-
-
-struct haiku_displaytarget
-{
- enum pipe_format format;
- color_space colorSpace;
-
- unsigned width;
- unsigned height;
- unsigned stride;
-
- unsigned size;
-
- void* data;
-};
-
-
-struct sw_winsys* hgl_create_sw_winsys();
+struct sw_winsys* hgl_create_sw_winsys(void);
#endif
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nouveau: allow more tokens by default to avoid parse failures
Module: Mesa
Branch: master
Commit: b4418cd4ce17cb6068fcb2c7dab874f4c4d880e1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4418cd4ce17cb6068fcb2c7dab874f4c4d880e1
Author: Ilia Mirkin
Date: Thu Aug 28 21:52:13 2014 -0400
nouveau: allow more tokens by default to avoid parse failures
Also print a note saying that parsing failed to help isolate issues.
Signed-off-by: Ilia Mirkin
---
src/gallium/drivers/nouveau/nouveau_compiler.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nouveau_compiler.c
b/src/gallium/drivers/nouveau/nouveau_compiler.c
index ac22035..8660498 100644
--- a/src/gallium/drivers/nouveau/nouveau_compiler.c
+++ b/src/gallium/drivers/nouveau/nouveau_compiler.c
@@ -139,7 +139,7 @@ nouveau_codegen(int chipset, int type, struct tgsi_token
tokens[],
int
main(int argc, char *argv[])
{
- struct tgsi_token tokens[1024];
+ struct tgsi_token tokens[4096];
int i, chipset = 0, type = -1;
const char *filename = NULL;
FILE *f;
@@ -195,8 +195,10 @@ main(int argc, char *argv[])
return 1;
}
- if (!tgsi_text_translate(text, tokens, Elements(tokens)))
+ if (!tgsi_text_translate(text, tokens, Elements(tokens))) {
+ _debug_printf("Failed to parse TGSI shader\n");
return 1;
+ }
if (chipset >= 0x50) {
i = nouveau_codegen(chipset, type, tokens, &size, &code);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965/disasm: Disassemble Z/NZ conditional modifiers as .z/ .nz.
Module: Mesa
Branch: master
Commit: 383eccb77e3a2e4f4788455ada9ca7b4497ec8c7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=383eccb77e3a2e4f4788455ada9ca7b4497ec8c7
Author: Matt Turner
Date: Sun Aug 24 14:49:51 2014 -0700
i965/disasm: Disassemble Z/NZ conditional modifiers as .z/.nz.
Reviewed-by: Kenneth Graunke
---
src/mesa/drivers/dri/i965/brw_disasm.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c
b/src/mesa/drivers/dri/i965/brw_disasm.c
index 424b214..65c6f23 100644
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -137,8 +137,8 @@ is_logic_instruction(unsigned opcode)
const char *const conditional_modifier[16] = {
[BRW_CONDITIONAL_NONE] = "",
- [BRW_CONDITIONAL_Z]= ".e",
- [BRW_CONDITIONAL_NZ] = ".ne",
+ [BRW_CONDITIONAL_Z]= ".z",
+ [BRW_CONDITIONAL_NZ] = ".nz",
[BRW_CONDITIONAL_G]= ".g",
[BRW_CONDITIONAL_GE] = ".ge",
[BRW_CONDITIONAL_L]= ".l",
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965/disasm: Show jump count for if/iff/halt.
Module: Mesa
Branch: master
Commit: 4fcefac7531dbf2b17c0dc133ba52505486c936e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4fcefac7531dbf2b17c0dc133ba52505486c936e
Author: Matt Turner
Date: Mon Aug 25 18:40:24 2014 -0700
i965/disasm: Show jump count for if/iff/halt.
These instructions don't have pop count.
Reviewed-by: Kenneth Graunke
---
src/mesa/drivers/dri/i965/brw_disasm.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c
b/src/mesa/drivers/dri/i965/brw_disasm.c
index 4374278..5a56591 100644
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -1259,7 +1259,7 @@ brw_disassemble_inst(FILE *file, struct brw_context *brw,
brw_inst *inst,
opcode == BRW_OPCODE_IFF ||
opcode == BRW_OPCODE_HALT)) {
pad(file, 16);
- format(file, "Jump: %d", brw_inst_gen4_pop_count(brw, inst));
+ format(file, "Jump: %d", brw_inst_gen4_jump_count(brw, inst));
} else if (brw->gen < 6 && opcode == BRW_OPCODE_ENDIF) {
pad(file, 16);
format(file, "Pop: %d", brw_inst_gen4_pop_count(brw, inst));
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965/disasm: Disassemble JMPI's source properly.
Module: Mesa
Branch: master
Commit: fb2fddefce75078bf6b1a904a65efc46c9ee6088
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb2fddefce75078bf6b1a904a65efc46c9ee6088
Author: Matt Turner
Date: Sat Aug 23 23:59:30 2014 -0700
i965/disasm: Disassemble JMPI's source properly.
The source can be a register as well as an immediate, and disassembling
a register as an immediate can have some strange results.
Reviewed-by: Kenneth Graunke
---
src/mesa/drivers/dri/i965/brw_disasm.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c
b/src/mesa/drivers/dri/i965/brw_disasm.c
index b73ada8..4374278 100644
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -1264,7 +1264,8 @@ brw_disassemble_inst(FILE *file, struct brw_context *brw,
brw_inst *inst,
pad(file, 16);
format(file, "Pop: %d", brw_inst_gen4_pop_count(brw, inst));
} else if (opcode == BRW_OPCODE_JMPI) {
- format(file, " %d", brw_inst_imm_d(brw, inst));
+ pad(file, 16);
+ err |= src1(file, brw, inst);
} else if (opcode_descs[opcode].nsrc == 3) {
pad(file, 16);
err |= dest_3src(file, brw, inst);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965: Mark BRW_CONDITIONAL_R as Gen <= 5.
Module: Mesa
Branch: master
Commit: 2cab62a68d5a86eef8e510bac176a14d0834787a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2cab62a68d5a86eef8e510bac176a14d0834787a
Author: Matt Turner
Date: Wed Aug 27 18:39:35 2014 -0700
i965: Mark BRW_CONDITIONAL_R as Gen <= 5.
---
src/mesa/drivers/dri/i965/brw_defines.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/brw_defines.h
b/src/mesa/drivers/dri/i965/brw_defines.h
index 968aba1..0ef43e9 100644
--- a/src/mesa/drivers/dri/i965/brw_defines.h
+++ b/src/mesa/drivers/dri/i965/brw_defines.h
@@ -731,7 +731,7 @@ enum PACKED brw_conditional_mod {
BRW_CONDITIONAL_GE = 4,
BRW_CONDITIONAL_L= 5,
BRW_CONDITIONAL_LE = 6,
- BRW_CONDITIONAL_R= 7,
+ BRW_CONDITIONAL_R= 7,/* Gen <= 5 */
BRW_CONDITIONAL_O= 8,
BRW_CONDITIONAL_U= 9,
};
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965/disasm: Add break/cont/halt to list of has_uip().
Module: Mesa Branch: master Commit: bef7a025ebd8bbe278b2740441db34484568021c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bef7a025ebd8bbe278b2740441db34484568021c Author: Matt Turner Date: Thu Aug 21 17:01:15 2014 -0700 i965/disasm: Add break/cont/halt to list of has_uip(). Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_disasm.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c index 65c6f23..b73ada8 100644 --- a/src/mesa/drivers/dri/i965/brw_disasm.c +++ b/src/mesa/drivers/dri/i965/brw_disasm.c @@ -110,7 +110,10 @@ has_jip(struct brw_context *brw, enum opcode opcode) return opcode == BRW_OPCODE_IF || opcode == BRW_OPCODE_ELSE || opcode == BRW_OPCODE_ENDIF || - opcode == BRW_OPCODE_WHILE; + opcode == BRW_OPCODE_WHILE || + opcode == BRW_OPCODE_BREAK || + opcode == BRW_OPCODE_CONTINUE || + opcode == BRW_OPCODE_HALT; } static bool ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): r600g: Reinstate include path to common radeon source directory
Module: Mesa
Branch: master
Commit: 2a99b6e40f7a083797435fd46b0fa885759d92cb
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a99b6e40f7a083797435fd46b0fa885759d92cb
Author: Michel Dänzer
Date: Fri Aug 29 12:09:16 2014 +0900
r600g: Reinstate include path to common radeon source directory
Fixes build failure since commit a131263a2f19507ca0d2f6093672d930a7c054d1
('gallium/radeon: cleanup header inclusion'):
../../../../../src/gallium/drivers/r600/evergreen_compute.c:50:30: fatal error:
radeon_llvm_util.h: No such file or directory
#include "radeon_llvm_util.h"
^
compilation terminated.
Trivial.
---
src/gallium/drivers/r600/Makefile.am |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/r600/Makefile.am
b/src/gallium/drivers/r600/Makefile.am
index ff84cd0..30e098e 100644
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -20,7 +20,8 @@ libr600_la_SOURCES = \
if NEED_RADEON_LLVM
AM_CFLAGS += \
- $(LLVM_CFLAGS)
+ $(LLVM_CFLAGS) \
+ -I$(top_srcdir)/src/gallium/drivers/radeon/
libr600_la_SOURCES += \
$(LLVM_C_SOURCES)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): u_vbuf: Make sure all caps are initialized
Module: Mesa
Branch: master
Commit: 6cd0dbc415dd092a72a8941c45ba812b9fe74b24
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cd0dbc415dd092a72a8941c45ba812b9fe74b24
Author: Michel Dänzer
Date: Thu Aug 28 11:12:20 2014 +0900
u_vbuf: Make sure all caps are initialized
Pointed out by valgrind.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83148
Reviewed-by: Alex Deucher
---
src/gallium/auxiliary/util/u_vbuf.c | 40 ++-
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_vbuf.c
b/src/gallium/auxiliary/util/u_vbuf.c
index 4bee899..650df9f 100644
--- a/src/gallium/auxiliary/util/u_vbuf.c
+++ b/src/gallium/auxiliary/util/u_vbuf.c
@@ -279,30 +279,22 @@ boolean u_vbuf_get_caps(struct pipe_screen *screen,
struct u_vbuf_caps *caps)
}
}
- if (!screen->get_param(screen,
- PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY)) {
- caps->buffer_offset_unaligned = TRUE;
- } else {
- fallback = TRUE;
- }
-
- if (!screen->get_param(screen,
- PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY)) {
- caps->buffer_stride_unaligned = TRUE;
- } else {
- fallback = TRUE;
- }
-
- if (!screen->get_param(screen,
-
PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY)) {
- caps->velem_src_offset_unaligned = TRUE;
- } else {
- fallback = TRUE;
- }
-
- if (screen->get_param(screen, PIPE_CAP_USER_VERTEX_BUFFERS)) {
- caps->user_vertex_buffers = TRUE;
- } else {
+ caps->buffer_offset_unaligned =
+ !screen->get_param(screen,
+ PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY);
+ caps->buffer_stride_unaligned =
+ !screen->get_param(screen,
+PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY);
+ caps->velem_src_offset_unaligned =
+ !screen->get_param(screen,
+
PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY);
+ caps->user_vertex_buffers =
+ screen->get_param(screen, PIPE_CAP_USER_VERTEX_BUFFERS);
+
+ if (!caps->buffer_offset_unaligned ||
+ !caps->buffer_stride_unaligned ||
+ !caps->velem_src_offset_unaligned ||
+ !caps->user_vertex_buffers) {
fallback = TRUE;
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
