isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests/cogl: Migrate primitive and journal test

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2555>
This commit is contained in:
Jonas Ådahl 2022-08-04 22:16:56 +02:00 committed by Marge Bot
parent 3750ed6a26
commit 20111fa8ca
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/tests/conform/meson.build
View File

@ -1,6 +1,5 @@
cogl_test_conformance_sources = [ cogl_test_conformance_sources = [
'test-conform-main.c', 'test-conform-main.c',
'test-primitive-and-journal.c',
'test-copy-replace-texture.c', 'test-copy-replace-texture.c',
'test-pipeline-cache-unrefs-texture.c', 'test-pipeline-cache-unrefs-texture.c',
'test-texture-no-allocate.c', 'test-texture-no-allocate.c',

2
cogl/tests/conform/test-conform-main.c
View File

@ -70,8 +70,6 @@ main (int argc, char **argv)
UNPORTED_TEST (test_vertex_buffer_interleved); UNPORTED_TEST (test_vertex_buffer_interleved);
UNPORTED_TEST (test_vertex_buffer_mutability); UNPORTED_TEST (test_vertex_buffer_mutability);
ADD_TEST (test_primitive_and_journal, 0, 0);
ADD_TEST (test_copy_replace_texture, 0, 0); ADD_TEST (test_copy_replace_texture, 0, 0);
ADD_TEST (test_pipeline_cache_unrefs_texture, 0, 0); ADD_TEST (test_pipeline_cache_unrefs_texture, 0, 0);

1
cogl/tests/conform/test-declarations.h
View File

@ -5,7 +5,6 @@ void test_path (void);
void test_path_clip (void); void test_path_clip (void);
void test_depth_test (void); void test_depth_test (void);
void test_backface_culling (void); void test_backface_culling (void);
void test_primitive_and_journal (void);
void test_copy_replace_texture (void); void test_copy_replace_texture (void);
void test_pipeline_cache_unrefs_texture (void); void test_pipeline_cache_unrefs_texture (void);
void test_pipeline_shader_state (void); void test_pipeline_shader_state (void);

1
src/tests/cogl/conform/meson.build
View File

@ -32,6 +32,7 @@ cogl_tests = [
[ 'test-alpha-textures', [] ], [ 'test-alpha-textures', [] ],
[ 'test-texture-get-set-data', [] ], [ 'test-texture-get-set-data', [] ],
[ 'test-framebuffer-get-bits', [] ], [ 'test-framebuffer-get-bits', [] ],
[ 'test-primitive-and-journal', [] ],
] ]
cogl_test_conformance_includes = [ cogl_test_conformance_includes = [

8
cogl/tests/conform/test-primitive-and-journal.c → src/tests/cogl/conform/test-primitive-and-journal.c
View File

@ -1,7 +1,6 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include "test-declarations.h" #include "tests/cogl-test-utils.h"
#include "test-utils.h"
typedef CoglVertexP2C4 Vertex; typedef CoglVertexP2C4 Vertex;
@ -63,7 +62,7 @@ create_pipeline (void)
return pipeline; return pipeline;
} }
void static void
test_primitive_and_journal (void) test_primitive_and_journal (void)
{ {
CoglPrimitive *primitives[2]; CoglPrimitive *primitives[2];
@ -118,3 +117,6 @@ test_primitive_and_journal (void)
g_print ("OK\n"); g_print ("OK\n");
} }
COGL_TEST_SUITE (
g_test_add_func ("/primitive-and-journal", test_primitive_and_journal);
)