Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mesa
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
virgl-es
mesa
Commits
00fe54a8
Commit
00fe54a8
authored
Jun 07, 2010
by
Keith Whitwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
graw: update graw_null after interface changes and build graw tests again
parent
14ce1860
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
14 deletions
+30
-14
SConstruct
SConstruct
+2
-1
src/gallium/SConscript
src/gallium/SConscript
+1
-1
src/gallium/targets/SConscript
src/gallium/targets/SConscript
+1
-1
src/gallium/targets/graw-null/SConscript
src/gallium/targets/graw-null/SConscript
+1
-0
src/gallium/targets/graw-null/graw_null.c
src/gallium/targets/graw-null/graw_null.c
+25
-11
No files found.
SConstruct
View file @
00fe54a8
...
...
@@ -31,7 +31,7 @@ import common
# Configuration options
default_statetrackers
=
'mesa'
default_targets
=
'
none
'
default_targets
=
'
graw-null
'
if
common
.
default_platform
in
(
'linux'
,
'freebsd'
,
'darwin'
):
default_drivers
=
'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe'
...
...
@@ -69,6 +69,7 @@ opts.Add(ListVariable('targets', 'driver targets to build', default_targets,
'egl-swrast'
,
'egl-vmwgfx'
,
'graw-xlib'
,
'graw-null'
,
'libgl-gdi'
,
'libgl-xlib'
,
'xorg-i915'
,
...
...
src/gallium/SConscript
View file @
00fe54a8
...
...
@@ -27,4 +27,4 @@ SConscript('targets/SConscript')
if
platform
!=
'embedded'
:
SConscript
(
'tests/unit/SConscript'
)
#
SConscript('tests/graw/SConscript')
SConscript
(
'tests/graw/SConscript'
)
src/gallium/targets/SConscript
View file @
00fe54a8
...
...
@@ -14,7 +14,7 @@ if 'mesa' in env['statetrackers']:
'libgl-gdi/SConscript'
,
])
if
not
'graw-xlib'
in
env
[
'targets'
]
and
not
env
[
'msvc'
]:
if
not
'graw-xlib'
in
env
[
'targets'
]
and
not
'graw-null'
in
env
[
'targets'
]
and
not
env
[
'msvc'
]:
# XXX: disable until MSVC can link correctly
SConscript
(
'graw-null/SConscript'
)
...
...
src/gallium/targets/graw-null/SConscript
View file @
00fe54a8
...
...
@@ -25,6 +25,7 @@ if env['platform'] == 'windows':
sources
=
[
'graw_null.c'
,
'../graw-xlib/graw_util.c'
,
]
if
True
:
...
...
src/gallium/targets/graw-null/graw_null.c
View file @
00fe54a8
...
...
@@ -3,6 +3,8 @@
#include "util/u_memory.h"
#include "target-helpers/wrap_screen.h"
#include "sw/null/null_sw_winsys.h"
#include "os/os_time.h"
#include "state_tracker/graw.h"
#ifdef GALLIUM_SOFTPIPE
#include "softpipe/sp_public.h"
...
...
@@ -21,13 +23,26 @@
#include <stdio.h>
static
struct
{
void
(
*
draw
)(
void
);
}
graw
;
struct
pipe_screen
*
graw_init
(
void
)
graw_create_window_and_screen
(
int
x
,
int
y
,
unsigned
width
,
unsigned
height
,
enum
pipe_format
format
,
void
**
handle
)
{
const
char
*
default_driver
;
const
char
*
driver
;
struct
pipe_screen
*
screen
=
NULL
;
struct
sw_winsys
*
winsys
=
NULL
;
static
int
dummy
;
/* Create the underlying winsys, which performs presents to Xlib
* drawables:
...
...
@@ -56,26 +71,25 @@ graw_init( void )
screen
=
softpipe_create_screen
(
winsys
);
#endif
*
handle
=
&
dummy
;
/* Inject any wrapping layers we want to here:
*/
return
gallium_wrap_screen
(
screen
);
}
void
*
graw_create_window
(
int
x
,
int
y
,
unsigned
width
,
unsigned
height
,
enum
pipe_format
format
)
void
graw_set_display_func
(
void
(
*
draw
)(
void
)
)
{
static
int
dummy
;
return
&
dummy
;
graw
.
draw
=
draw
;
}
void
graw_
destroy_window
(
void
*
window
)
graw_
main_loop
(
void
)
{
graw
.
draw
();
os_time_sleep
(
100000
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment