AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/xvmc: fix tests so that they pass

Browse Source 
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Ilia Mirkin
2014-02-16 02:21:59 -05:00
parent 8b5f894e13
commit 6958fb341f
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/xvmc/tests/test_rendering.c
+5 -7
View File
@@ -50,9 +50,7 @@
#define DEFAULT_OUTPUT_HEIGHT INPUT_HEIGHT
#define DEFAULT_ACCEPTABLE_ERR 0.01
void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *output_height, double *acceptable_error, int *prompt);
void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *output_height, double *acceptable_error, int *prompt)
static void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *output_height, double *acceptable_error, int *prompt)
{
int fail = 0;
int i;
@@ -60,7 +58,7 @@ void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *
*output_width = DEFAULT_OUTPUT_WIDTH;
*output_height = DEFAULT_OUTPUT_HEIGHT;
*acceptable_error = DEFAULT_ACCEPTABLE_ERR;
*prompt = 1;
*prompt = 0;
for (i = 1; i < argc && !fail; ++i)
{
@@ -79,8 +77,8 @@ void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *
if (sscanf(argv[++i], "%lf", acceptable_error) != 1)
fail = 1;
}
else if (strcmp(argv[i], "-n"))
*prompt = 0;
else if (!strcmp(argv[i], "-p"))
*prompt = 1;
else
fail = 1;
}
@@ -95,7 +93,7 @@ void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *
"\t-w <width>\tOutput width\n"
"\t-h <height>\tOutput height\n"
"\t-e <error>\tAcceptable margin of error per pixel, from 0 to 1\n"
"\t-n\tDon't prompt for quit\n",
"\t-p\tPrompt for quit\n",
argv[0]
);
}
src/gallium/state_trackers/xvmc/tests/test_subpicture.c
+6 -2
View File
@@ -165,8 +165,12 @@ int main(int argc, char **argv)
assert(subpicture.xvimage_id == subpics[i].id);
/* Test width & height assigned and correct */
assert(subpicture.width == width && subpicture.height == height);
/* Test no palette support */
assert(subpicture.num_palette_entries == 0 && subpicture.entry_bytes == 0);
if (subpics[i].type == XvRGB)
/* Test no palette support */
assert(subpicture.num_palette_entries == 0 && subpicture.entry_bytes == 0);
else
/* Test palette support */
assert(subpicture.num_palette_entries == 16 && subpicture.entry_bytes == 4);
/* Test valid params */
assert(XvMCDestroySubpicture(display, &subpicture) == Success);
}
src/gallium/state_trackers/xvmc/tests/testlib.c
+1 -1
View File
@@ -85,7 +85,7 @@ int GetPort
{
for (k = 0; k < num_mc_types && !found_port; ++k)
{
if (surface_info[j].mc_type == mc_types[k])
if ((surface_info[j].mc_type & mc_types[k]) == mc_types[k])
{
for (l = 0; l < adaptor_info[i].num_ports && !found_port; ++l)
{