tests/cogl: Migrate copy/replace texture test

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2555>
This commit is contained in:
Jonas Ådahl 2022-08-04 22:19:01 +02:00 committed by Marge Bot
parent 20111fa8ca
commit 68dcde0bdb
5 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,5 @@
cogl_test_conformance_sources = [ cogl_test_conformance_sources = [
'test-conform-main.c', 'test-conform-main.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',
'test-pipeline-shader-state.c', 'test-pipeline-shader-state.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_copy_replace_texture, 0, 0);
ADD_TEST (test_pipeline_cache_unrefs_texture, 0, 0); ADD_TEST (test_pipeline_cache_unrefs_texture, 0, 0);
ADD_TEST (test_pipeline_shader_state, 0, 0); ADD_TEST (test_pipeline_shader_state, 0, 0);

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_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);
void test_gles2_context (void); void test_gles2_context (void);

View File

@ -33,6 +33,7 @@ cogl_tests = [
[ 'test-texture-get-set-data', [] ], [ 'test-texture-get-set-data', [] ],
[ 'test-framebuffer-get-bits', [] ], [ 'test-framebuffer-get-bits', [] ],
[ 'test-primitive-and-journal', [] ], [ 'test-primitive-and-journal', [] ],
[ 'test-copy-replace-texture', [] ],
] ]
cogl_test_conformance_includes = [ cogl_test_conformance_includes = [

View File

@ -1,8 +1,7 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <string.h> #include <string.h>
#include "test-declarations.h" #include "tests/cogl-test-utils.h"
#include "test-utils.h"
/* Keep track of the number of textures that we've created and are /* Keep track of the number of textures that we've created and are
* still alive */ * still alive */
@ -54,7 +53,7 @@ create_texture (void)
return tex_2d; return tex_2d;
} }
void static void
test_copy_replace_texture (void) test_copy_replace_texture (void)
{ {
CoglPipeline *pipelines[N_PIPELINES]; CoglPipeline *pipelines[N_PIPELINES];
@ -119,3 +118,7 @@ test_copy_replace_texture (void)
if (cogl_test_verbose ()) if (cogl_test_verbose ())
g_print ("OK\n"); g_print ("OK\n");
} }
COGL_TEST_SUITE (
g_test_add_func ("/copy-replace-texture", test_copy_replace_texture);
)